diff --git a/lab2/activity1.asm b/lab2/activity1.asm new file mode 100644 index 0000000..9a98065 --- /dev/null +++ b/lab2/activity1.asm @@ -0,0 +1,10 @@ +.include "msp430g2553.inc" + +org 0xc000 +START: + mov.b #11111111b, &P1DIR + mov.b &P1IN, R7 ;R7 = 0x01 + bis.w #CPUOFF, SR + +org 0xfffe + dw START \ No newline at end of file diff --git a/lab2/activity1.hex b/lab2/activity1.hex new file mode 100644 index 0000000..af08be0 --- /dev/null +++ b/lab2/activity1.hex @@ -0,0 +1,3 @@ +:0CC00000F24322005742200032D0100012 +:02FFFE0000C041 +:00000001FF diff --git a/lab2/lab2.asm b/lab2/lab2.asm index 0c9dbc1..c1cbd3b 100644 --- a/lab2/lab2.asm +++ b/lab2/lab2.asm @@ -8,13 +8,9 @@ START: mov.b #11110111b, &P1DIR ; set digits - mov.b #0, &P1OUT mov.b #01100001b, &P1OUT ; xxx6 - mov.b #01000011b, &P1OUT ; xx46 - mov.b #00010101b, &P1OUT ; x146 - mov.b #01000111b, &P1OUT ; 4146 ; disable diff --git a/lab2/lab2.hex b/lab2/lab2.hex index 79ab509..8ca95c9 100644 --- a/lab2/lab2.hex +++ b/lab2/lab2.hex @@ -1,5 +1,5 @@ :10C0000031400004B240805A2001F240F700220083 -:10C01000C2432100F24061002100F24043002100B0 -:10C02000F24015002100F2404700210032D01000FC +:10C01000F24061002100F24043002100F24015008F +:0CC020002100F2404700210032D0100047 :02FFFE0000C041 :00000001FF diff --git a/lab2/prog1.asm b/lab2/prog1.asm index 47d15e8..ba23e45 100644 --- a/lab2/prog1.asm +++ b/lab2/prog1.asm @@ -1,17 +1,18 @@ .include "msp430g2553.inc" + org 0xc000 start: - mov.w #WDTPW|WDTHOLD, &WDTCTL - mov.b #0x41, &P1DIR - mov.w #0x01, r8 + mov.w #WDTPW|WDTHOLD, &WDTCTL + mov.b #0x41, &P1DIR ; 01000001b + mov.w #0x01, r8 repeat: - mov.b r8, &P1OUT - xor.b #0x41, r8 - mov.w #60000, r9 + mov.b r8, &P1OUT + xor.b #0x41, r8 + mov.w #60000, r9 waiter: - dec r9 - jnz waiter - jmp repeat + dec r9 + jnz waiter + jmp repeat org 0xfffe - dw start \ No newline at end of file + dw start \ No newline at end of file