X-Git-Url: http://www.average.org/gitweb/?p=sensor-light.git;a=blobdiff_plain;f=msp430%2Fmain.c;h=b3eb36f5028f3c93debc0d736c407c5ca91e7c87;hp=09b34f84d319d716f6c295a9b1f5af557adaa3f7;hb=e4103ba7e965373201b1e22f193fe9d72304aa22;hpb=1a62521725ad19dbf39ac0e8a5e11f2aeac08579 diff --git a/msp430/main.c b/msp430/main.c index 09b34f8..b3eb36f 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,45 +28,70 @@ int main(void) WDTCTL = WDTPW | WDTHOLD; // stop watchdog timer // Configure GPIO Out - P1DIR |= BIT0|BIT1|BIT2; // Set LEDs & PWM 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 +#ifdef P1SEL1 + P1SEL1 |= BIT7; // PWM out +#else + P1SEL |= BIT7; // PWM out +#endif // 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 + 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 - // Configure ADC A7 pin - SYSCFG2 |= ADCPCTL7; + 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 + +#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_7; // A7 ADC input select; Vref=AVCC + 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 + ADC10CTL0 = ADC10SHT_2 + ADC10ON + ADC10IE; // ADCON, S&H=16 ADC clks + ADC10CTL1 = INCH_4; // A4 ADC input select + // channel 5 is unused, reserved for measuring current +#endif + + // Timer and ADC + +#ifndef TASSEL__SMCLK +# define TASSEL__SMCLK TASSEL_2 +#endif +#ifndef MC__UP +# define MC__UP MC_1 +#endif +#ifndef MC__CONTINUOUS +# define MC__CONTINUOUS MC_2 +#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 + 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, interrupt enable +#ifdef LOCKLPM5 // Disable the GPIO power-on default high-impedance mode to activate // previously configured port settings PM5CTL0 &= ~LOCKLPM5; +#endif while(1) { @@ -68,13 +108,19 @@ int main(void) Time_Left = 15; continue; } - ADCCTL0 |= ADCENC | ADCSC; // Sampling and conversion start - P1OUT |= BIT1; // Set P1.1 LED on + // Sampling and conversion start +#ifdef ADCENC + ADCCTL0 |= ADCENC | ADCSC; +#else + ADC10CTL0 |= ENC + ADC10SC; +#endif + 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< 10) { Time_Count = 0; - P1OUT ^= BIT0; + P1OUT ^= BIT_RL; // blink if (Time_Left) Time_Left--; else if (Duty_Cycle > 1) @@ -146,17 +192,18 @@ void __attribute__ ((interrupt(TIMER1_A1_VECTOR))) Timer_A (void) break; // CCR2 not used case TA1IV_TAIFG: irq_events |= 1< 1000) { - // Time_Count = 0; - // __bic_SR_register_on_exit(LPM0_bits); // Clear CPUOFF bit from LPM0 - //} } +#ifndef ADC_VECTOR +# define ADCMEM0 ADC10MEM +# define ADC_VECTOR ADC10_VECTOR +#endif + // ADC interrupt service routine #if defined(__TI_COMPILER_VERSION__) || defined(__IAR_SYSTEMS_ICC__) #pragma vector=ADC_VECTOR @@ -167,6 +214,7 @@ void __attribute__ ((interrupt(ADC_VECTOR))) ADC_ISR (void) #error Compiler not supported! #endif { +#ifdef ADCIV_NONE switch(__even_in_range(ADCIV,ADCIV_ADCIFG)) { case ADCIV_NONE: @@ -182,13 +230,16 @@ void __attribute__ ((interrupt(ADC_VECTOR))) ADC_ISR (void) case ADCIV_ADCINIFG: break; case ADCIV_ADCIFG: +#endif ADC_Result = ADCMEM0; irq_events |= 1<