X-Git-Url: http://www.average.org/gitweb/?p=sensor-light.git;a=blobdiff_plain;f=msp430%2Fmain.c;h=38f681c340a9c117b789fa140d3bfff63c8555e5;hp=5d03cca04d33314f26f55b56db6791904824b907;hb=7cd84e920809d1e8f15209fa17ab21a81af40435;hpb=058ef70c8107e74aca0f3e3f7291fc8e75143e9c;ds=sidebyside

diff --git a/msp430/main.c b/msp430/main.c
index 5d03cca..38f681c 100644
--- a/msp430/main.c
+++ b/msp430/main.c
@@ -4,6 +4,21 @@ static volatile unsigned int ADC_Result;
 static volatile unsigned int irq_events = 0;
 enum {ev_btn1 = 0, ev_btn2, ev_pir1, ev_pir2, ev_tmr, ev_adc, ev_MAX};
 
+#ifdef ADCSC /* Let us hope that this is a "new" model */
+# define BIT_RL BIT0
+# define BIT_GL BIT1
+# define PBTN(x) P2##x
+# define BIT_BTN BIT3
+# define HAVE_BTN2
+# define BIT_BTN2 BIT7
+#else
+# define BIT_RL BIT0
+# define BIT_GL BIT6
+# define PBTN(x) P1##x
+# define BIT_BTN BIT3
+# define BIT_BTN2 0
+#endif
+
 int main(void)
 {
 	int Duty_Cycle = 1;
@@ -13,42 +28,46 @@ int main(void)
 
 	WDTCTL = WDTPW | WDTHOLD;	// stop watchdog timer
 	// Configure GPIO Out
-	P1DIR |= BIT0|BIT1|BIT2;     // Set P1.0&1&2/LEDs to output direction
-	P1OUT &= ~(BIT0|BIT1);       // P1.0&1 LEDs off
-	P1SEL1 |= BIT2;              // P1.2 PWM out
+	P1DIR |= BIT_RL|BIT_GL|BIT7;	// Set LEDs & PWM to output direction
+	P1OUT &= ~(BIT_RL|BIT_GL);	// LEDs off
+	P1SEL1 |= BIT7;			// PWM out
 
 	// Configure GPIO In
-	P2DIR &= ~(BIT3|BIT7);       // Buttons
-	P2OUT |= BIT3|BIT7;          // Pull up
-	P2REN |= BIT3|BIT7;          // Enable pull-up
-	P2IES |= BIT3|BIT7;          // INT on Hi->Lo edge
-	P2IE  |= BIT3|BIT7;          // INT enable
-
-	P2DIR &= ~(BIT2|BIT5);       // PIR Sensors
-	P2OUT &= ~(BIT2|BIT5);       // Pull down
-	P2REN |= BIT2|BIT5;          // Enable pull-down
-	P2IES &= ~(BIT2|BIT5);       // INT on Lo->Hi edge
-	P2IE  |= BIT2|BIT5;          // INT enable
-	P2IFG = 0;                   // ??? Needed?
-
-	// Configure ADC A7 pin
-	SYSCFG2 |= ADCPCTL7;
+	PBTN(DIR) &= ~(BIT_BTN|BIT_BTN2);	// Buttons
+	PBTN(OUT) |= BIT_BTN|BIT_BTN2;		// Pull up
+	PBTN(REN) |= BIT_BTN|BIT_BTN2;		// Enable pull-up
+	PBTN(IES) |= BIT_BTN|BIT_BTN2;		// INT on Hi->Lo edge
+	PBTN(IE)  |= BIT_BTN|BIT_BTN2;		// INT enable
+
+	P2DIR &= ~(BIT4|BIT5);		// PIR Sensors
+	P2OUT &= ~(BIT4|BIT5);		// Pull down
+	P2REN |= BIT4|BIT5;		// Enable pull-down
+	P2IES &= ~(BIT4|BIT5);		// INT on Lo->Hi edge
+	P2IE  |= BIT4|BIT5;		// INT enable
 
 	// Configure ADC10
-	ADCCTL0 |= ADCSHT_2 | ADCON;        // ADCON, S&H=16 ADC clks
-	ADCCTL1 |= ADCSHP;                  // ADCCLK = MODOSC; sampling timer
-	ADCCTL2 |= ADCRES;                  // 10-bit conversion results
-	ADCMCTL0 |= ADCINCH_7;              // A7 ADC input select; Vref=AVCC
-	ADCIE |= ADCIE0;                    // Enable ADC conv complete interrupt
+
+#ifdef ADCPCTL4 /* Newer model */
+	SYSCFG2 |= ADCPCTL4|ADCPCTL5;	// disconnect pin 4 and 5 from GPIO
+	ADCCTL0 |= ADCSHT_2 | ADCON;	// ADCON, S&H=16 ADC clks
+	ADCCTL1 |= ADCSHP;		// ADCCLK = MODOSC; sampling timer
+	ADCCTL2 |= ADCRES;		// 10-bit conversion results
+	ADCMCTL0 |= ADCINCH_4;		// A4 ADC input select; Vref=AVCC
+	ADCIE |= ADCIE0;		// Enable ADC conv complete interrupt
+	// channel 5 is unused, reserved for measuring current
+#else
+# error older mode ADC unimplemented
+	// channel 5 is unused, reserved for measuring current
+#endif
 
 	// Configure timer A0 for PWM
-	TA0CCR0 = 10000-1;                         // PWM Period
-	TA0CCTL2 = OUTMOD_7;                      // CCR2 reset/set
-	TA0CCR2 = 500;                     // CCR2 PWM duty cycle
-	TA0CTL = TASSEL__SMCLK | MC__UP | TACLR;  // SMCLK, up mode, clear TAR
+	TA0CCR0 = 10000-1;		// PWM Period
+	TA0CCTL2 = OUTMOD_7;		// CCR2 reset/set
+	TA0CCR2 = 500;			// CCR2 PWM duty cycle
+	TA0CTL = TASSEL__SMCLK | MC__UP | TACLR;	// SMCLK, up mode, clear TAR
 
 	//Configure timer A1 for counting time
-	TA1CTL |= TASSEL__SMCLK | MC__CONTINUOUS | TACLR | TAIE;     // SMCLK, no divider, continuous mode
+	TA1CTL |= TASSEL__SMCLK | MC__CONTINUOUS | TACLR | TAIE;	// SMCLK, no divider, continuous mode
 
 	// Disable the GPIO power-on default high-impedance mode to activate
 	// previously configured port settings
@@ -58,10 +77,10 @@ int main(void)
 	{
 		unsigned int events;
 
-		_disable_interrupt();
+		_disable_interrupts();
 		events = irq_events;
 		irq_events = 0;
-		_enable_interrupt();
+		_enable_interrupts();
 
 		// Button 2 or PIR events initiate light measurement and tuns on green led
 		if (events & (1<<ev_btn2|1<<ev_pir1|1<<ev_pir2)) {
@@ -69,13 +88,15 @@ int main(void)
 				Time_Left = 15;
 				continue;
 			}
-			ADCCTL0 |= ADCENC | ADCSC;                       // Sampling and conversion start
-			P1OUT |= BIT1;                                   // Set P1.1 LED on
+			ADCCTL0 |= ADCENC | ADCSC;	// Sampling and conversion start
+			// ADC10CTL0 |= ENC + ADC10SC;	// Sampling and conversion start
+			P1OUT |= BIT_GL;	// Set green LED on
 		}
 
-		// End of light measurement, set new Duty_Cycle and zero increment and tuns off green led
+		// End of light measurement,
+		// set new Duty_Cycle and zero increment and turn off green led
 		if (events & 1<<ev_adc) {
-			P1OUT &= ~BIT1;                                  // Clear P1.1 LED off
+			P1OUT &= ~BIT_GL;	// Clear green LED off
 			if (Time_Left)
 				continue;
 			if (ADC_Result < 200)
@@ -99,7 +120,7 @@ int main(void)
 		if (events & 1<<ev_tmr) {
 			if (Time_Count++ > 10) {
 				Time_Count = 0;
-				P1OUT ^= BIT0;
+				P1OUT ^= BIT_RL; // blink
 				if (Time_Left)
 					Time_Left--;
 				else if (Duty_Cycle > 1)
@@ -124,7 +145,7 @@ int main(void)
 		__bis_SR_register(LPM0_bits | GIE);
 		__no_operation();
 	}
-	retun 0; /* not reached */
+	return 0; /* not reached */
 }
 
 // TIMER interrupt routine
@@ -140,22 +161,18 @@ void __attribute__ ((interrupt(TIMER1_A1_VECTOR))) Timer_A (void)
 	switch(__even_in_range(TA1IV,TA1IV_TAIFG))
 	{
 		case TA1IV_NONE:
-			break;                               // No interrupt
+			break;	// No interrupt
 		case TA1IV_TACCR1:
-			break;                               // CCR1 not used
+			break;	// CCR1 not used
 		case TA1IV_TACCR2:
-			break;                               // CCR2 not used
+			break;	// CCR2 not used
 		case TA1IV_TAIFG:
 			irq_events |= 1<<ev_tmr;
-			__bic_SR_register_on_exit(LPM0_bits);            // Clear CPUOFF bit from LPM0
+			__bic_SR_register_on_exit(LPM0_bits);	// Wake up
 			break;
 		default:
 			break;
 	}
-	//if (Time_Count++ > 1000) {
-	//    Time_Count = 0;
-	//    __bic_SR_register_on_exit(LPM0_bits);            // Clear CPUOFF bit from LPM0
-	//}
 }
 
 // ADC interrupt service routine
@@ -185,7 +202,7 @@ void __attribute__ ((interrupt(ADC_VECTOR))) ADC_ISR (void)
 		case ADCIV_ADCIFG:
 			ADC_Result = ADCMEM0;
 			irq_events |= 1<<ev_adc;
-			__bic_SR_register_on_exit(LPM0_bits);            // Clear CPUOFF bit from LPM0
+			__bic_SR_register_on_exit(LPM0_bits);	// Wake up
 			break;
 		default:
 			break;
@@ -202,21 +219,23 @@ void __attribute__ ((interrupt(PORT2_VECTOR))) Port_2 (void)
 #error Compiler not supported!
 #endif
 {
-	if (P2IFG & BIT3) {
+	if (PBTN(IFG) & BIT_BTN) {
 		irq_events |= 1<<ev_btn1;
-		P2IFG &= ~BIT3;                      // Clear P1.3 IFG
+		PBTN(IFG) &= ~BIT_BTN;	// Clear button IFG
 	}
-	if (P2IFG & BIT7) {
+#ifdef HAVE_BTN2
+	if (PBTN(IFG) & BIT_BTN2) {
 		irq_events |= 1<<ev_btn2;
-		P2IFG &= ~BIT7;                      // Clear P1.3 IFG
+		PBTN(IFG) &= ~BIT_BTN2;	// Clear button 2 IFG
 	}
-	if (P2IFG & BIT2) {
+#endif
+	if (P2IFG & BIT4) {
 		irq_events |= 1<<ev_pir1;
-		P2IFG &= ~BIT2;                      // Clear P1.4 IFG
+		P2IFG &= ~BIT4;	// Clear P2.4 IFG
 	}
 	if (P2IFG & BIT5) {
 		irq_events |= 1<<ev_pir2;
-		P2IFG &= ~BIT5;                      // Clear P1.7 IFG
+		P2IFG &= ~BIT5;	// Clear P2.5 IFG
 	}
-	__bic_SR_register_on_exit(LPM3_bits);   // Exit LPM3
+	__bic_SR_register_on_exit(LPM0_bits);	// Wake up
 }