#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 WAKEUP() (__bic_SR_register_on_exit(LPM3_bits))
#endif
-#define NUM_HANDLERS 3
+#define NUM_HANDLERS 5
#define BUTTON_HANDLER_ID 0
-#define TICK_HANDLER_ID 1
-#define DISPATCH_HANDLER_ID 2
+#define EVENT4_HANDLER_ID 1
+#define EVENT5_HANDLER_ID 2
+#define TICK_HANDLER_ID 3
+#define DISPATCH_HANDLER_ID 4
-int32_t buttonCnt = 0;
-
-static void buttonHandler(void);
+static void buttonHandler(uint8_t id);
static void postEvent(uint8_t handlerId);
static Hal_Handler appButtonHandler;
uint8_t id;
for (id = 0, mask = 0x1; id < NUM_HANDLERS; id++, mask <<= 1) {
if ((events & mask) && handlerTab[id]) {
- handlerTab[id]();
+ handlerTab[id](id);
}
}
}
/* -------- INTERNAL FUNCTIONS -------- */
-static void buttonHandler(void) {
- Hal_delay(100);
+static void buttonHandler(uint8_t id) {
+ Hal_delay(BUTTON_DEBOUNCE_MSECS);
if (BUTTON_PRESSED() && appButtonHandler) {
- appButtonHandler();
+ appButtonHandler(id);
}
+ BUTTON_ENABLE();
}
static void postEvent(uint8_t handlerId) {
#pragma vector=PORT1_VECTOR
#endif
INTERRUPT void buttonIsr(void) {
- buttonCnt++;
- postEvent(BUTTON_HANDLER_ID);
- BUTTON_ENABLE();
+ if (BUTTON_FIRED())
+ postEvent(BUTTON_HANDLER_ID);
+ BUTTON_DISABLE();
WAKEUP();
}