Added dimmer and tones (sings Happy Birthday).

lab3/Makefile

@@ -13,7 +13,7 @@ GDB     = $(GCC_DIR)/msp430-elf-gdb
 CFLAGS = -I $(SUPPORT_FILE_DIRECTORY) -mmcu=$(DEVICE) -Os -g
 LFLAGS = -L $(SUPPORT_FILE_DIRECTORY) -T $(DEVICE).ld
 
-all: prog1 prog2 adc pwm
+all: prog1 prog2 adc pwm dimmer tones
 
 prog1: prog1.c
 	$(CC) $(CFLAGS) $(LFLAGS) $? -o prog1.elf
@@ -27,6 +27,12 @@ adc:   adc.c
 pwm:   pwm.c
 	$(CC) $(CFLAGS) $(LFLAGS) $? -o pwm.elf
 	$(CC) $(CFLAGS) $(LFLAGS) $? -S -o pwm.asm
+dimmer:   dimmer.c
+	$(CC) $(CFLAGS) $(LFLAGS) $? -o dimmer.elf
+	$(CC) $(CFLAGS) $(LFLAGS) $? -S -o dimmer.asm
+tones:   tones.c
+	$(CC) $(CFLAGS) $(LFLAGS) $? -o tones.elf
+	$(CC) $(CFLAGS) $(LFLAGS) $? -S -o tones.asm
 
 debug: all
 	$(GDB) ${EXEC}

lab3/dimmer.c

@@ -0,0 +1,24 @@
+#include "msp430.h"
+
+void main(void) {
+    WDTCTL    = WDTPW + WDTHOLD;
+    
+    ADC10CTL0 = ADC10SHT_2 + ADC10ON;
+    ADC10CTL1 = INCH_1;
+    ADC10AE0 |= 0x02;
+
+    P1DIR |= BIT2;
+    P1SEL |= BIT2;
+  
+    CCR0  = 1000-1;
+    CCTL1 = OUTMOD_7;
+    CCR1  = 250;
+    TACTL = TASSEL_2 + MC_1;
+
+    while (1) {
+        ADC10CTL0 |= ENC + ADC10SC;     // Sampling and conversion start
+        while (ADC10CTL1 &ADC10BUSY);   // ADC10BUSY?
+        CCR1 = 1000 * ADC10MEM / 0x3FF;
+        for (volatile unsigned int i = 0xFFFF; i > 0; i--);
+    }
+}

lab3/pwm.c

@@ -1,15 +1,14 @@
 #include "msp430.h"
 
 void main(void) {
-   WDTCTL = WDTPW + WDTHOLD;    // Stop WDT
+    WDTCTL = WDTPW + WDTHOLD;    // Stop WDT
   
-   P1DIR |= BIT2;               // P1.2 to output
+    P1DIR |= BIT2;               // P1.2 to output
-   P1SEL |= BIT2;               // P1.2 to TA0.1
+    P1SEL |= BIT2;               // P1.2 to TA0.1
   
-   CCR0  = 1000-1;              // PWM Period
+    CCR0  = 1000-1;              // PWM Period
-   CCTL1 = OUTMOD_7;            // CCR1 reset/set
+    CCTL1 = OUTMOD_7;            // CCR1 reset/set
-   CCR1  = 250;                 // CCR1 PWM duty cycle
+    CCR1  = 250;                 // CCR1 PWM duty cycle
-   TACTL = TASSEL_2 + MC_1;     // SMCLK, up mode
+    TACTL = TASSEL_2 + MC_1;     // SMCLK, up mode
-   _BIS_SR(LPM0_bits);          // Enter Low Power Mode 0
+    _BIS_SR(LPM0_bits);          // Enter Low Power Mode 0
 }
-

lab3/tones.c

@@ -0,0 +1,137 @@
+#include "msp430.h"
+
+#define c     1000
+#define dflat 950
+#define d     900
+#define eflat 850
+#define e     800
+#define f     750
+#define gflat 720
+#define g     670
+#define aflat 625
+#define a     600
+#define bflat 570
+#define b     535
+#define cc    500
+#define n     0
+
+int hbd[30] = {
+    c,  n, c, 
+    d,  c, f,
+    e,  c, n, c,
+    d,  c, g,
+    f,  c, n, c,
+    cc, a, f,
+    e,  d, bflat, n, bflat,
+    a,  f, g,
+    f,  n
+};
+int hbd_lengths[30] = {
+    1, 1, 1, 
+    3, 3, 3, 
+    6, 1, 1, 1,
+    3, 3, 3, 
+    6, 1, 1, 1, 
+    3, 3, 3, 
+    3, 4, 1, 1, 1, 
+    3, 3, 3, 
+    6, 3
+};
+
+int scale[13] = {
+    c, dflat, d, eflat, e, f, gflat, g, aflat, a, bflat, b, cc
+};
+int scale_lengths[13] = {
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+};
+
+// 7 6 4 5   3   2   1  0
+// ..note.. str out A1 A0
+unsigned char show(int note) {
+    switch (note) {
+        case c:
+        case cc:
+            return 0xc0;
+        case d:
+        case dflat:
+            return 0xd0;
+        case e:
+        case eflat:
+            return 0xe0;
+        case f:
+            return 0xf0;
+        case g:
+        case gflat:
+            return 0x60;
+        case a:
+        case aflat:
+            return 0xa0;
+        case bflat:
+        case b:
+            return 0xb0;
+        default:
+            return 0x00;
+    }
+}
+
+unsigned char acc(int note) {
+    switch (note) {
+        case bflat:
+        case dflat:
+        case eflat:
+        case gflat:
+        case aflat:
+            return 0xf1;
+        case cc:
+            return 0xc1;
+        default:
+            return 0x01;
+    }
+}
+
+void sing(int* song, int* song_lengths, int length) {
+    while (1) {
+        for (int i = 0; i < length; i++) {
+            int note = song[i];
+            CCR0   =  note != 0  ? note : CCR0;
+            CCR1   = (note != 0) * 100;
+
+            P1OUT  = show(note);
+            P1OUT |= 0x08;
+            P1OUT  = acc(note);
+            P1OUT |= 0x08;
+
+            for (volatile unsigned int length = song_lengths[i]; length > 0; length--) {
+                for (volatile unsigned int i = 0x4FFF; i > 0; i--);
+            }
+        }
+    }
+}
+
+void clear() {
+    P1OUT = 0x00;
+    P1OUT = 0x08;
+    
+    P1OUT = 0x01;
+    P1OUT = 0x09;
+    
+    P1OUT = 0x02;
+    P1OUT = 0x0a;
+
+    P1OUT = 0x03;
+    P1OUT = 0x0b;
+}
+
+void main(void) {
+    WDTCTL = WDTPW + WDTHOLD;    // Stop WDT
+  
+    P1DIR  = 0xFF;               // all set to output
+    P1SEL |= BIT2;               // P1.2 to TA0.1
+  
+    CCTL1 = OUTMOD_7;            // CCR1 reset/set
+    TACTL = TASSEL_2 + MC_1;     // SMCLK, up mode
+    
+    clear();
+    sing(hbd, hbd_lengths, 30);
+    //sing(scale, scale_lengths, 13);
+}