#define RED_LED_READ() (P1OUT & BIT0)
#define RED_LED_TOGGLE() (P1OUT ^= BIT0)
-#define BUTTON_CONFIG() (P1DIR &= ~BIT3, P1REN |= BIT3, P1OUT |= BIT3, P1IES |= BIT3);
-#define BUTTON_ENABLE() (P1IFG &= ~BIT3, P1IE |= BIT3)
-#define BUTTON_DISABLE() (P1IE &= ~BIT3, P1IFG &= ~BIT3)
-#define BUTTON_FIRED() (P1IFG & BIT3)
-#define BUTTON_PRESSED() (!(P1IN & BIT3))
-#define BUTTON_DEBOUNCE_MSECS 100
+#define GPIO_CONFIG(mask) (P1DIR &= ~mask, P1REN |= mask, P1OUT |= mask, P1IES |= mask);
+#define GPIO_ENABLE(mask) (P1IFG &= ~mask, P1IE |= mask)
+#define GPIO_DISABLE(mask) (P1IE &= ~mask, P1IFG &= ~mask)
+#define GPIO_FIRED(mask) (P1IFG & mask)
+#define GPIO_LOW(mask) (!(P1IN & mask))
+#define GPIO_DEBOUNCE_MSECS 100
#define DEBUG1_CONFIG() (P2DIR |= BIT3)
#define DEBUG1_ON() (P2OUT |= BIT3)
#define EAP_TX_INT_ENABLE() (IE2 |= UCA0TXIE)
#define MCLK_TICKS_PER_MS 1000L
-#define ACLK_TICKS_PER_SECOND 12000L
+#define ACLK_TICKS_PER_SECOND 1500L /* was 12000L with divider /1 */
#define UART_WATCHDOG_PERIOD (ACLK_TICKS_PER_SECOND * 250) / 1000
#define UART_WATCH_DISABLE() (TA1CCTL1 = 0) // Turn off CCR1 Interrupt
#define NUM_HANDLERS 5
-#define BUTTON_HANDLER_ID 0
+#define EVENT3_HANDLER_ID 0
#define EVENT4_HANDLER_ID 1
#define EVENT5_HANDLER_ID 2
#define TICK_HANDLER_ID 3
#define DISPATCH_HANDLER_ID 4
-static void buttonHandler(uint8_t id);
+static void gpioHandler(uint8_t id);
static void postEvent(uint8_t handlerId);
-static Hal_Handler appButtonHandler;
+static Hal_Handler appGpioHandler;
static volatile uint16_t handlerEvents = 0;
static uint16_t clockTick = 0;
static Hal_Handler handlerTab[NUM_HANDLERS];
/* -------- APP-HAL INTERFACE -------- */
-void Hal_buttonEnable(Hal_Handler handler) {
- handlerTab[BUTTON_HANDLER_ID] = buttonHandler;
- appButtonHandler = handler;
- BUTTON_CONFIG();
- Hal_delay(100);
- BUTTON_ENABLE();
+void Hal_gpioEnable(Hal_Handler handler) {
+ uint8_t id;
+ uint16_t mask;
+
+ for (id = 0, mask = BIT3; id < 3; id++, mask <<= 1) {
+ handlerTab[id] = gpioHandler;
+ appGpioHandler = handler;
+ (P1DIR &= ~mask, P1REN |= mask, P1OUT |= mask, P1IES |= mask);
+ Hal_delay(100);
+ (P1IFG &= ~mask, P1IE |= mask);
+ }
}
void Hal_connected(void) {
/* setup clocks */
WDTCTL = WDTPW + WDTHOLD;
+ /* MCLK = DCOCLK */
+ /* MCLK divider = /1 */
+ /* SMCLK divider = /1 */
BCSCTL2 = SELM_0 + DIVM_0 + DIVS_0;
if (CALBC1_1MHZ != 0xFF) {
DCOCTL = 0x00;
BCSCTL1 = CALBC1_1MHZ; /* Set DCO to 1MHz */
DCOCTL = CALDCO_1MHZ;
}
- BCSCTL1 |= XT2OFF + DIVA_0;
+ /* XT2 is off (Not used for MCLK/SMCLK) */
+ /* ACLK divider = /8 */
+ BCSCTL1 |= XT2OFF + DIVA_3;
+ /* XT2 range = 0.4 - 1 MHz */
+ /* LFXT1 range/VLO = VLOCLK (or 3-16 MHz if XTS=1) */
+ /* Capacitor 6 pF */
BCSCTL3 = XT2S_0 + LFXT1S_2 + XCAP_1;
/* setup LEDs */
/* -------- INTERNAL FUNCTIONS -------- */
-static void buttonHandler(uint8_t id) {
- Hal_delay(BUTTON_DEBOUNCE_MSECS);
- if (BUTTON_PRESSED() && appButtonHandler) {
- appButtonHandler(id);
- }
- BUTTON_ENABLE();
+static void gpioHandler(uint8_t id) {
+ uint16_t mask = BIT3 << id;
+
+ Hal_delay(GPIO_DEBOUNCE_MSECS);
+ if (GPIO_LOW(mask) && appGpioHandler)
+ appGpioHandler(id);
+ GPIO_ENABLE(mask);
}
static void postEvent(uint8_t handlerId) {
#ifdef __TI_COMPILER_VERSION__
#pragma vector=PORT1_VECTOR
#endif
-INTERRUPT void buttonIsr(void) {
- if (BUTTON_FIRED())
- postEvent(BUTTON_HANDLER_ID);
- BUTTON_DISABLE();
+INTERRUPT void gpioIsr(void) {
+ uint8_t id;
+ uint16_t mask;
+
+ for (id = 0, mask = BIT3; id < 3; id++, mask <<= 1)
+ if (GPIO_FIRED(mask)) {
+ postEvent(id);
+ GPIO_DISABLE(mask);
+ }
WAKEUP();
}