PHYS319-2018WT2
/
labs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finished ADC activity; fixed type in comments in Prog1

This commit is contained in:
Jonathan Chan 2018-01-30 11:52:40 -08:00
parent fa80cbcf8b
commit fc1dbf88d9
6 changed files with 82 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lab3/adc.asm
View File

@ -27,7 +27,7 @@ main:
.loc 1 34 0 .loc 1 34 0
BIS.B #2, &ADC10AE0 BIS.B #2, &ADC10AE0
.loc 1 35 0 .loc 1 35 0
BIS.B #1, &P1DIR BIS.B #69, &P1DIR
.L2: .L2:
.LBB2: .LBB2:
.loc 1 38 0 .loc 1 38 0
@ -36,15 +36,25 @@ main:
.loc 1 39 0 discriminator 1 .loc 1 39 0 discriminator 1
BIT.W #1, &ADC10CTL1 { JNE .L3 BIT.W #1, &ADC10CTL1 { JNE .L3
.loc 1 40 0 .loc 1 40 0
MOV.W &ADC10MEM, R12 AND.B #-70, &P1OUT
MOV.W #766, R13
CMP.W R12, R13 { JLO .L4
.loc 1 41 0 .loc 1 41 0
BIC.B #1, &P1OUT MOV.W &ADC10MEM, R12
MOV.W #767, R13
CMP.W R12, R13 { JHS .L4
.loc 1 42 0
BIS.B #1, &P1OUT
BR #.L2 BR #.L2
.L4: .L4:
.loc 1 43 0 .loc 1 43 0
BIS.B #1, &P1OUT MOV.W &ADC10MEM, R12
MOV.W #306, R13
CMP.W R12, R13 { JLO .L6
.loc 1 44 0
BIS.B #64, &P1OUT
BR #.L2
.L6:
.loc 1 46 0
BIS.B #4, &P1OUT
BR #.L2 BR #.L2
.LBE2: .LBE2:
.LFE0: .LFE0:
@ -607,7 +617,7 @@ main:
.uleb128 0x9 .uleb128 0x9
.string "i" .string "i"
.byte 0x1 .byte 0x1
.byte 0x2d .byte 0x30
.4byte 0x25 .4byte 0x25
.byte 0 .byte 0
.byte 0 .byte 0

11
lab3/adc.c
View File

@ -32,15 +32,18 @@ void main(void) {
ADC10CTL0 = ADC10SHT_2 + ADC10ON; // ADC10ON ADC10CTL0 = ADC10SHT_2 + ADC10ON; // ADC10ON
ADC10CTL1 = INCH_1; // input A1 ADC10CTL1 = INCH_1; // input A1
ADC10AE0 |= 0x02; // PA.1 ADC option select ADC10AE0 |= 0x02; // PA.1 ADC option select
P1DIR |= 0x01; // Set P1.0 to output direction P1DIR |= 0x45; // Set P1.0 to output direction
while (1) { while (1) {
ADC10CTL0 |= ENC + ADC10SC; // Sampling and conversion start ADC10CTL0 |= ENC + ADC10SC; // Sampling and conversion start
while (ADC10CTL1 &ADC10BUSY); // ADC10BUSY? while (ADC10CTL1 &ADC10BUSY); // ADC10BUSY?
if (ADC10MEM < 0x2FF) { P1OUT &= ~0x45;
P1OUT &= ~0x01; // Clear P1.0 LED off if (ADC10MEM > 0x2FF) {
P1OUT |= 0x01;
} else if (ADC10MEM < 0x133) {
P1OUT |= 0x40;
} else { } else {
P1OUT |= 0x01; // Set P1.0 LED on P1OUT |= 0x04;
} }
unsigned i; unsigned i;
for (i = 0xFFFF; i > 0; i--); // Delay for (i = 0xFFFF; i > 0; i--); // Delay

6
lab3/lab3_notes.txt Normal file
View File

@ -0,0 +1,6 @@
For a 3.3 V CMOS input,
- V_IH > 2 V
- V_IL < 0.8 V
Assuming the ADC scale is linear in voltage and is zero at 0V,
- 2V => 0x2FF (given) = 767
- 0.8 V => 0.8 / 2 * 767 = 307 = 0x133

108
lab3/prog1.asm
View File

@ -10,14 +10,14 @@ main:
.loc 1 18 0 .loc 1 18 0
; start of function ; start of function
; framesize_regs: 0 ; framesize_regs: 0
; framesize_locals: 2 ; framesize_locals: 4
; framesize_outgoing: 0 ; framesize_outgoing: 0
; framesize: 2 ; framesize: 4
; elim ap -> fp 2 ; elim ap -> fp 2
; elim fp -> sp 2 ; elim fp -> sp 4
; saved regs:(none) ; saved regs:(none)
; start of prologue ; start of prologue
SUB.W #2, R1 SUB.W #4, R1
.LCFI0: .LCFI0:
; end of prologue ; end of prologue
.loc 1 21 0 .loc 1 21 0
@ -27,36 +27,39 @@ main:
.loc 1 23 0 .loc 1 23 0
MOV.B #1, &P1OUT MOV.B #1, &P1OUT
.LBB2: .LBB2:
.loc 1 26 0
MOV.B #0, R13
.loc 1 27 0 .loc 1 27 0
MOV.W #-5536, R12 MOV.W #-5536, R12
.L6: .L6:
.LVL0: .loc 1 26 0
MOV.W R12, @R1 MOV.B R13, 1(R1)
.L2:
.loc 1 26 0 is_stmt 0 discriminator 1
MOV.B 1(R1), R14
MOV.B #1, R15
CMP.B R14, R15 { JHS .L5
.LBE2:
.loc 1 32 0 is_stmt 1
XOR.B #65, &P1OUT
.loc 1 26 0
BR #.L6
.L5:
.LBB3:
.loc 1 27 0
MOV.W R12, 2(R1)
.L3: .L3:
.loc 1 28 0 .loc 1 28 0
MOV.W @R1, R13 MOV.W 2(R1), R14
CMP.W #0, R13 { JEQ .L2 CMP.W #0, R14 { JNE .L4
.loc 1 29 0 .loc 1 26 0 discriminator 2
ADD.W #-1, @R1 ADD.B #1, 1(R1)
BR #.L3 BR #.L2
.L2:
.LVL1:
.loc 1 27 0
MOV.W R12, @R1
.L5:
.loc 1 28 0
MOV.W @R1, R13
CMP.W #0, R13 { JEQ .L4
.loc 1 29 0
ADD.W #-1, @R1
BR #.L5
.L4: .L4:
.LVL2: .loc 1 29 0
.LBE2: ADD.W #-1, 2(R1)
.loc 1 32 0 discriminator 1 BR #.L3
XOR.B #65, &P1OUT .LBE3:
.loc 1 26 0 discriminator 1
BR #.L6
.LFE0: .LFE0:
.size main, .-main .size main, .-main
.section .debug_frame,"",@progbits .section .debug_frame,"",@progbits
@ -85,7 +88,7 @@ main:
.byte 0x4 .byte 0x4
.4byte .LCFI0-.LFB0 .4byte .LCFI0-.LFB0
.byte 0xe .byte 0xe
.uleb128 0x4 .uleb128 0x6
.balign 4 .balign 4
.LEFDE0: .LEFDE0:
.text .text
@ -93,7 +96,7 @@ main:
.file 2 "/home/jonathan/ti/msp430_gcc/include/msp430g2553.h" .file 2 "/home/jonathan/ti/msp430_gcc/include/msp430g2553.h"
.section .debug_info,"",@progbits .section .debug_info,"",@progbits
.Ldebug_info0: .Ldebug_info0:
.4byte 0x4fe .4byte 0x4f9
.2byte 0x4 .2byte 0x4
.4byte .Ldebug_abbrev0 .4byte .Ldebug_abbrev0
.byte 0x4 .byte 0x4
@ -624,14 +627,15 @@ main:
.byte 0x91 .byte 0x91
.sleb128 -4 .sleb128 -4
.uleb128 0x9 .uleb128 0x9
.4byte .LBB2 .4byte .Ldebug_ranges0+0
.4byte .LBE2-.LBB2
.uleb128 0xa .uleb128 0xa
.string "i" .string "i"
.byte 0x1 .byte 0x1
.byte 0x1a .byte 0x1a
.4byte 0x3c .4byte 0x43
.4byte .LLST0 .uleb128 0x2
.byte 0x91
.sleb128 -5
.byte 0 .byte 0
.byte 0 .byte 0
.byte 0 .byte 0
@ -766,10 +770,8 @@ main:
.uleb128 0x9 .uleb128 0x9
.uleb128 0xb .uleb128 0xb
.byte 0x1 .byte 0x1
.uleb128 0x11 .uleb128 0x55
.uleb128 0x1 .uleb128 0x17
.uleb128 0x12
.uleb128 0x6
.byte 0 .byte 0
.byte 0 .byte 0
.uleb128 0xa .uleb128 0xa
@ -784,30 +786,10 @@ main:
.uleb128 0x49 .uleb128 0x49
.uleb128 0x13 .uleb128 0x13
.uleb128 0x2 .uleb128 0x2
.uleb128 0x17 .uleb128 0x18
.byte 0 .byte 0
.byte 0 .byte 0
.byte 0 .byte 0
.section .debug_loc,"",@progbits
.Ldebug_loc0:
.LLST0:
.4byte .LVL0-.Ltext0
.4byte .LVL1-.Ltext0
.2byte 0x2
.byte 0x30
.byte 0x9f
.4byte .LVL1-.Ltext0
.4byte .LVL2-.Ltext0
.2byte 0x2
.byte 0x31
.byte 0x9f
.4byte .LVL2-.Ltext0
.4byte .LFE0-.Ltext0
.2byte 0x2
.byte 0x32
.byte 0x9f
.4byte 0
.4byte 0
.section .debug_aranges,"",@progbits .section .debug_aranges,"",@progbits
.4byte 0x1c .4byte 0x1c
.2byte 0x2 .2byte 0x2
@ -820,6 +802,14 @@ main:
.4byte .Letext0-.Ltext0 .4byte .Letext0-.Ltext0
.4byte 0 .4byte 0
.4byte 0 .4byte 0
.section .debug_ranges,"",@progbits
.Ldebug_ranges0:
.4byte .LBB2-.Ltext0
.4byte .LBE2-.Ltext0
.4byte .LBB3-.Ltext0
.4byte .LBE3-.Ltext0
.4byte 0
.4byte 0
.section .debug_line,"",@progbits .section .debug_line,"",@progbits
.Ldebug_line0: .Ldebug_line0:
.section .debug_str,"MS",@progbits,1 .section .debug_str,"MS",@progbits,1

4
lab3/prog1.c
View File

@ -23,10 +23,10 @@ void main(void) {
P1OUT = 0x01; // Set the output P1OUT = 0x01; // Set the output
while (1) { // Loop forever while (1) { // Loop forever
for (unsigned char i = 0; i < 2; i++) { for (volatile unsigned char i = 0; i < 2; i++) {
count = 60000; count = 60000;
while (count != 0) { while (count != 0) {
count--; // decrement count--; // decrement
} }
} }
P1OUT = P1OUT ^ 0x41; // bitwise xor the output with 0x41 P1OUT = P1OUT ^ 0x41; // bitwise xor the output with 0x41

2
lab3/prog2.c
View File

@ -31,6 +31,6 @@ void main(void) {
// Port 1 interrupt service routine // Port 1 interrupt service routine
void __attribute__ ((interrupt(PORT1_VECTOR))) PORT1_ISR(void) { void __attribute__ ((interrupt(PORT1_VECTOR))) PORT1_ISR(void) {
P1OUT ^= stateChanger; // toggle the LEDS P1OUT ^= stateChanger; // toggle the LEDS
stateChanger ^= 0x40; // 0x01 -> 0x40 -> 0x01 stateChanger ^= 0x40; // 0x01 -> 0x41 -> 0x01
P1IFG &= ~0x08; // Clear P1.3 IFG. If you don't, it just happens again. P1IFG &= ~0x08; // Clear P1.3 IFG. If you don't, it just happens again.
} }