count interrupts, disable for 100ms

[pulsecounter.git] / Hal / Hal.c

diff --git a/Hal/Hal.c b/Hal/Hal.c
index 91f635fc6610a7b808b61528e7f41d570a8b8187..ef498ba6f3d0b36a463b8b23e6666815b925b979 100644 (file)
--- a/Hal/Hal.c
+++ b/Hal/Hal.c
@@ -10,18 +10,22 @@
 
 /* -------- INTERNAL FEATURES -------- */
 
 
 /* -------- INTERNAL FEATURES -------- */
 

-#define LED_CONFIG()                (P1DIR |= BIT6)
-#define LED_ON()                    (P1OUT |= BIT6)
-#define LED_OFF()                   (P1OUT &= ~BIT6)
-#define LED_READ()                  (P1OUT & BIT6)
-#define LED_TOGGLE()                (P1OUT ^= BIT6)
-
-#define CONNECTED_LED_CONFIG()      (P1DIR |= BIT0)
-#define CONNECTED_LED_ON()          (P1OUT |= BIT0)
-#define CONNECTED_LED_OFF()         (P1OUT &= ~BIT0)
+#define GREEN_LED_CONFIG()                (P1DIR |= BIT6)
+#define GREEN_LED_ON()                    (P1OUT |= BIT6)
+#define GREEN_LED_OFF()                   (P1OUT &= ~BIT6)
+#define GREEN_LED_READ()                  (P1OUT & BIT6)
+#define GREEN_LED_TOGGLE()                (P1OUT ^= BIT6)
+
+#define RED_LED_CONFIG()                  (P1DIR |= BIT0)
+#define RED_LED_ON()                      (P1OUT |= BIT0)
+#define RED_LED_OFF()                     (P1OUT &= ~BIT0)
+#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_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 BUTTON_PRESSED()            (!(P1IN & BIT3))
 #define BUTTON_DEBOUNCE_MSECS       100
 


@@ -108,7 +112,6 @@ void Hal_buttonEnable(Hal_Handler handler) {
 }
 
 void Hal_connected(void) {
 }
 
 void Hal_connected(void) {

-    CONNECTED_LED_ON();

 }
 
 void Hal_debugOn(uint8_t line) {
 }
 
 void Hal_debugOn(uint8_t line) {


@@ -150,7 +153,6 @@ void Hal_delay(uint16_t msecs) {
 }
 
 void Hal_disconnected(void) {
 }
 
 void Hal_disconnected(void) {

-    CONNECTED_LED_OFF();

 }
 
 void Hal_init(void) {
 }
 
 void Hal_init(void) {


@@ -169,10 +171,10 @@ void Hal_init(void) {
 
     /* setup LEDs */
 
 
     /* setup LEDs */
 

-    LED_CONFIG();
-    LED_OFF();
-    CONNECTED_LED_CONFIG();
-    CONNECTED_LED_OFF();
+    GREEN_LED_CONFIG();
+    GREEN_LED_OFF();
+    RED_LED_CONFIG();
+    RED_LED_OFF();

 
     /* setup debug pins */
 
 
     /* setup debug pins */
 


@@ -234,20 +236,36 @@ void Hal_idleLoop(void) {
     }
 }
 
     }
 }
 

-void Hal_ledOn(void) {
-    LED_ON();
+void Hal_greenLedOn(void) {
+    GREEN_LED_ON();
+}
+
+void Hal_greenLedOff(void) {
+    GREEN_LED_OFF();
+}
+
+bool Hal_greenLedRead(void) {
+    return GREEN_LED_READ();
+}
+
+void Hal_greenLedToggle(void) {
+    GREEN_LED_TOGGLE();

 }
 
 }
 

-void Hal_ledOff(void) {
-    LED_OFF();
+void Hal_redLedOn(void) {
+    RED_LED_ON();

 }
 
 }
 

-bool Hal_ledRead(void) {
-    return LED_READ();
+void Hal_redLedOff(void) {
+    RED_LED_OFF();

 }
 
 }
 

-void Hal_ledToggle(void) {
-    LED_TOGGLE();
+bool Hal_redLedRead(void) {
+    return RED_LED_READ();
+}
+
+void Hal_redLedToggle(void) {
+    RED_LED_TOGGLE();

 }
 
 void Hal_tickStart(uint16_t msecs, Hal_Handler handler) {
 }
 
 void Hal_tickStart(uint16_t msecs, Hal_Handler handler) {


@@ -257,6 +275,11 @@ void Hal_tickStart(uint16_t msecs, Hal_Handler handler) {
     TA1CCTL0 = CCIE;                            // Enable the CCR0 interrupt
 }
 
     TA1CCTL0 = CCIE;                            // Enable the CCR0 interrupt
 }
 

+void Hal_tickStop(void) {
+    handlerTab[TICK_HANDLER_ID] = 0;
+    TA1CCR0 = 0;
+    TA1CCTL0 = 0;
+}

 
 /* -------- SRT-HAL INTERFACE -------- */
 
 
 /* -------- SRT-HAL INTERFACE -------- */
 


@@ -304,10 +327,11 @@ void Em_Hal_watchOn(void) {
 /* -------- INTERNAL FUNCTIONS -------- */
 
 static void buttonHandler(void) {
 /* -------- INTERNAL FUNCTIONS -------- */
 
 static void buttonHandler(void) {

-    Hal_delay(100);
+    Hal_delay(BUTTON_DEBOUNCE_MSECS);

     if (BUTTON_PRESSED() && appButtonHandler) {
         appButtonHandler();
     }
     if (BUTTON_PRESSED() && appButtonHandler) {
         appButtonHandler();
     }

+    BUTTON_ENABLE();

 }
 
 static void postEvent(uint8_t handlerId) {
 }
 
 static void postEvent(uint8_t handlerId) {


@@ -325,8 +349,9 @@ static void postEvent(uint8_t handlerId) {
     #pragma vector=PORT1_VECTOR
 #endif
 INTERRUPT void buttonIsr(void) {
     #pragma vector=PORT1_VECTOR
 #endif
 INTERRUPT void buttonIsr(void) {

-    postEvent(BUTTON_HANDLER_ID);
-    BUTTON_ENABLE();
+    if (BUTTON_FIRED())
+        postEvent(BUTTON_HANDLER_ID);
+    BUTTON_DISABLE();

     WAKEUP();
 }
 
     WAKEUP();
 }