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

Minor edits

This commit is contained in:
Jonathan Chan 2018-02-03 22:14:47 -08:00
parent d39f41ec24
commit 3b11618cce
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lab3/Makefile
View File

@ -38,4 +38,5 @@ debug: all
$(GDB) ${EXEC} $(GDB) ${EXEC}
clean: clean:
rm prog1.elf prog2.elf adc.elf pwm.elf prog1.asm prog2.asm adc.asm pwm.asm rm prog1.elf prog1.asm prog2.elf prog2.asm adc.elf adc.asm \
pwm.elf pwm.asm dimmer.elf dimmer.asm tones.elf tones.asm

2
lab3/adc.c
View File

@ -36,7 +36,7 @@ void main(void) {
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?
P1OUT &= ~0x45; P1OUT &= ~0x45;
if (ADC10MEM > 0x2FF) { if (ADC10MEM > 0x2FF) {
P1OUT |= 0x01; P1OUT |= 0x01;

21
lab3/dimmer.asm
View File

@ -49,25 +49,23 @@ main:
.loc 1 14 0 .loc 1 14 0
MOV.W #224, &TA0CCTL1 MOV.W #224, &TA0CCTL1
.loc 1 15 0 .loc 1 15 0
MOV.W #250, &TA0CCR1
.loc 1 16 0
MOV.W #528, &TA0CTL MOV.W #528, &TA0CTL
.loc 1 21 0 .loc 1 20 0
MOV.W #__mspabi_mpyi, R10 MOV.W #__mspabi_mpyi, R10
MOV.W #1000, R8 MOV.W #1000, R8
MOV.W #__mspabi_divu, R9 MOV.W #__mspabi_divu, R9
MOV.W #1023, R7 MOV.W #1023, R7
.LBB2: .LBB2:
.loc 1 22 0 .loc 1 21 0
MOV.W #-1, R6 MOV.W #-1, R6
.L5: .L5:
.LBE2: .LBE2:
.loc 1 19 0 .loc 1 18 0
BIS.W #3, &ADC10CTL0 BIS.W #3, &ADC10CTL0
.L2: .L2:
.loc 1 20 0 discriminator 1 .loc 1 19 0 discriminator 1
BIT.W #1, &ADC10CTL1 { JNE .L2 BIT.W #1, &ADC10CTL1 { JNE .L2
.loc 1 21 0 .loc 1 20 0
MOV.W R8, R13 MOV.W R8, R13
MOV.W &ADC10MEM, R12 MOV.W &ADC10MEM, R12
CALL R10 CALL R10
@ -75,15 +73,16 @@ main:
MOV.W R7, R13 MOV.W R7, R13
CALL R9 CALL R9
.LVL1: .LVL1:
ADD.W #1, R12
MOV.W R12, &TA0CCR1 MOV.W R12, &TA0CCR1
.LBB3: .LBB3:
.loc 1 22 0 .loc 1 21 0
MOV.W R6, @R1 MOV.W R6, @R1
.L3: .L3:
.loc 1 22 0 is_stmt 0 discriminator 1 .loc 1 21 0 is_stmt 0 discriminator 1
MOV.W @R1, R12 MOV.W @R1, R12
CMP.W #0, R12 { JEQ .L5 CMP.W #0, R12 { JEQ .L5
.loc 1 22 0 discriminator 3 .loc 1 21 0 discriminator 3
ADD.W #-1, @R1 ADD.W #-1, @R1
BR #.L3 BR #.L3
.LBE3: .LBE3:
@ -680,7 +679,7 @@ main:
.uleb128 0x9 .uleb128 0x9
.string "i" .string "i"
.byte 0x1 .byte 0x1
.byte 0x16 .byte 0x15
.4byte 0x2c .4byte 0x2c
.uleb128 0x2 .uleb128 0x2
.byte 0x91 .byte 0x91

7
lab3/dimmer.c
View File

@ -12,13 +12,12 @@ void main(void) {
CCR0 = 1000-1; CCR0 = 1000-1;
CCTL1 = OUTMOD_7; CCTL1 = OUTMOD_7;
CCR1 = 250;
TACTL = TASSEL_2 + MC_1; TACTL = TASSEL_2 + MC_1;
while (1) { while (1) {
ADC10CTL0 |= ENC + ADC10SC; // Sampling and conversion start ADC10CTL0 |= ENC + ADC10SC;
while (ADC10CTL1 &ADC10BUSY); // ADC10BUSY? while (ADC10CTL1 & ADC10BUSY);
CCR1 = 1000 * ADC10MEM / 0x3FF; CCR1 = (1000 * ADC10MEM) / 0x3FF;
for (volatile unsigned int i = 0xFFFF; i > 0; i--); for (volatile unsigned int i = 0xFFFF; i > 0; i--);
} }
} }