X-Git-Url: http://www.average.org/gitweb/?a=blobdiff_plain;f=msp430%2FHal%2FHal.c;h=4cae9fab389db0e8d4a7bbc33858400ff0374025;hb=4e9dda3367ff17c80358426a6b4126704741c0b1;hp=0cdcc297a85b19169fad377c4cf5a2cb2575ed75;hpb=02d2dc9e46149beb63a3dac83a9346232e2626da;p=pulsecounter.git

diff --git a/msp430/Hal/Hal.c b/msp430/Hal/Hal.c
index 0cdcc29..4cae9fa 100644
--- a/msp430/Hal/Hal.c
+++ b/msp430/Hal/Hal.c
@@ -29,14 +29,6 @@
 #define GPIO_LOW(mask)              (!(P1IN & mask))
 #define GPIO_DEBOUNCE_MSECS         100
 
-#define DEBUG1_CONFIG()             (P2DIR |= BIT3)
-#define DEBUG1_ON()                 (P2OUT |= BIT3)
-#define DEBUG1_OFF()                (P2OUT &= ~BIT3)
-
-#define DEBUG2_CONFIG()             (P2DIR |= BIT4)
-#define DEBUG2_ON()                 (P2OUT |= BIT4)
-#define DEBUG2_OFF()                (P2OUT &= ~BIT4)
-
 #define EAP_RX_BUF                  UCA0RXBUF
 #define EAP_TX_BUF                  UCA0TXBUF
 
@@ -101,7 +93,51 @@ static Hal_Handler appGpioHandler;
 static volatile uint16_t handlerEvents = 0;
 static uint16_t clockTick = 0;
 static Hal_Handler handlerTab[NUM_HANDLERS];
+static uint32_t gpioCount[3];
+static bool timerActive[3] = {false, false, false};
+static uint16_t timerPoint[3];
+
+/* -------- INTERNAL FUNCTIONS -------- */
 
+static void gpioHandler(uint8_t id) {
+    uint8_t i;
+    uint16_t now, left;
+
+    if (timerActive[id])
+        return;
+    timerActive[id] = true;
+    now = TA1R;
+    timerPoint[id] = now + ACLK_TICKS_PER_SECOND; // One second ahead
+    left = ACLK_TICKS_PER_SECOND;
+    for (i = 0; i < 3; i++)
+        if (timerActive[i] && (timerPoint[i] - now) < left) {
+            left = timerPoint[i] - now;
+        }
+    TA1CCR0 = now + left;
+    TA1CCTL0 = CCIE;
+}
+
+static void tickHandler(uint16_t clock) {
+    uint8_t i;
+
+    for (i = 0; i < 3; i++)
+        if (timerActive[i] && timerPoint[i] == clock) {
+            uint32_t count = Hal_gpioCount(i);
+
+            if (count) {
+                ; // update timer; call jitter handler
+            } else {
+                ; // clear timer; call app gpio handler
+            }
+        }
+    // if all timers are unset, disable ticker.
+}
+
+static void postEvent(uint8_t handlerId) {
+    uint8_t key = Em_Hal_lock();
+    handlerEvents |= 1 << handlerId;
+    Em_Hal_unlock(key);
+}
 
 /* -------- APP-HAL INTERFACE -------- */
 
@@ -116,43 +152,12 @@ void Hal_gpioEnable(Hal_Handler handler) {
         Hal_delay(100);
         (P1IFG &= ~mask, P1IE |= mask);
     }
+    handlerTab[TICK_HANDLER_ID] = tickHandler;
 }
 
 void Hal_connected(void) {
 }
 
-void Hal_debugOn(uint8_t line) {
-    switch (line) {
-    case 1:
-        DEBUG1_ON();
-        break;
-    case 2:
-        DEBUG2_ON();
-    }
-}
-
-void Hal_debugOff(uint8_t line) {
-    switch (line) {
-    case 1:
-        DEBUG1_OFF();
-        break;
-    case 2:
-        DEBUG2_OFF();
-    }
-}
-
-void Hal_debugPulse(uint8_t line) {
-    switch (line) {
-    case 1:
-        DEBUG1_ON();
-        DEBUG1_OFF();
-        break;
-    case 2:
-        DEBUG2_ON();
-        DEBUG2_OFF();
-    }
-}
-
 void Hal_delay(uint16_t msecs) {
     while (msecs--) {
         __delay_cycles(MCLK_TICKS_PER_MS);
@@ -191,13 +196,6 @@ void Hal_init(void) {
     RED_LED_CONFIG();
     RED_LED_OFF();
 
-    /* setup debug pins */
-
-    DEBUG1_CONFIG(); DEBUG1_OFF();
-    DEBUG2_CONFIG(); DEBUG2_OFF();
-
-    DEBUG1_ON(); DEBUG1_OFF();
-
     /* setup TimerA1 */
     TA1CTL = TASSEL_1 + MC_2;           // ACLK, Continuous mode
     UART_WATCH_DISABLE();
@@ -241,12 +239,15 @@ void Hal_idleLoop(void) {
             uint8_t id;
             for (id = 0, mask = 0x1; id < NUM_HANDLERS; id++, mask <<= 1) {
                 if ((events & mask) && handlerTab[id]) {
-                    handlerTab[id](id);
+                    if (id == TICK_HANDLER_ID)
+                        handlerTab[id](TA1R);
+                    else
+                        handlerTab[id](id);
                 }
             }
         }
         else {          // await more events
-            SLEEP();
+            SLEEP();    // this also enables interrupts
         }
     }
 }
@@ -283,11 +284,13 @@ void Hal_redLedToggle(void) {
     RED_LED_TOGGLE();
 }
 
-void Hal_tickStart(uint16_t msecs, Hal_Handler handler) {
+uint16_t Hal_tickStart(uint16_t msecs, void (*handler)(uint16_t clock)) {
     handlerTab[TICK_HANDLER_ID] = handler;
-    clockTick = (ACLK_TICKS_PER_SECOND * msecs) / 1000;
-    TA1CCR0 = TA1R + clockTick;                 // Set the CCR0 interrupt for msecs from now.
+    uint16_t clockTick = (ACLK_TICKS_PER_SECOND * msecs) / 1000;
+    uint16_t then = TA1R + clockTick;
+    TA1CCR0 = then;               // Set the CCR0 interrupt for msecs from now.
     TA1CCTL0 = CCIE;                            // Enable the CCR0 interrupt
+    return then;
 }
 
 void Hal_tickStop(void) {
@@ -296,6 +299,14 @@ void Hal_tickStop(void) {
     TA1CCTL0 = 0;
 }
 
+uint32_t Hal_gpioCount(uint8_t id) {
+    DINT();
+    uint32_t count = gpioCount[id];
+    gpioCount[id] = 0;
+    EINT();
+    return count;
+}
+
 /* -------- SRT-HAL INTERFACE -------- */
 
 uint8_t Em_Hal_lock(void) {
@@ -338,24 +349,6 @@ void Em_Hal_watchOn(void) {
     UART_WATCH_ENABLE();
 }
 
-
-/* -------- INTERNAL FUNCTIONS -------- */
-
-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) {
-    uint8_t key = Em_Hal_lock();
-    handlerEvents |= 1 << handlerId;
-    Em_Hal_unlock(key);
-}
-
 /* -------- INTERRUPT SERVICE ROUTINES -------- */
 
 #ifdef __GNUC__
@@ -370,8 +363,8 @@ INTERRUPT void gpioIsr(void) {
 
     for (id = 0, mask = BIT3; id < 3; id++, mask <<= 1)
         if (GPIO_FIRED(mask)) {
+            gpioCount[id]++;
             postEvent(id);
-            GPIO_DISABLE(mask);
         }
     WAKEUP();
 }