X-Git-Url: http://www.average.org/gitweb/?p=pulsecounter.git;a=blobdiff_plain;f=Pulsecounter-Prog.c;h=ced5632fa253abca6f0cf3b09e1e998b960bbc87;hp=d5170af1a5adc722a38b1d86ef05883570e6ac85;hb=9289332e07e03c86a13fbcdaa8ec3dbafd5faf09;hpb=4639a1ba298618c2a617ca4428cae14c6a531ae3

diff --git a/Pulsecounter-Prog.c b/Pulsecounter-Prog.c
index d5170af..ced5632 100644
--- a/Pulsecounter-Prog.c
+++ b/Pulsecounter-Prog.c
@@ -1,48 +1,66 @@
 #include "Pulsecounter.h"
 #include "Hal.h"
 
-static void buttonHandler(void);
+static void gpioHandler(uint8_t id);
 static void tickHandler(void);
+static int32_t cold = 0;
+static int32_t hot  = 0;
 static bool connected = false;
-static int32_t base4 = 0;
-static int32_t base5 = 1000;
-static int32_t event4 = 0;
-static int32_t event5 = 0;
-
-static bool cold = true;
+static bool updatable = false;
 
 void main() {
     Hal_init();
-    Hal_buttonEnable(buttonHandler);
+    Hal_gpioEnable(gpioHandler);
     Pulsecounter_setDeviceName("PULS-CNTR");
     Pulsecounter_start();
     Hal_idleLoop();
 }
 
-static void buttonHandler(void) {
+static void gpioHandler(uint8_t id) {
     uint8_t i;
 
-    cold = !cold;
-    if (cold)
-        event4++;
-    else
-        event5++;
-    if (connected) {
-        if (cold)
-            Pulsecounter_event4_indicate();
-        else
-            Pulsecounter_event5_indicate();
-    }
-    else
-        Pulsecounter_accept(true);
-    for (i = 0; i < 3; i++) {
+    switch (id) {
+    case 0:
+        /* Pulsecounter_accept(true); */
+        updatable = true;
+        if (connected) {
+            Pulsecounter_coldTick_indicate();
+            Hal_delay(100);
+            Pulsecounter_hotTick_indicate();
+        }
         Hal_greenLedOn();
         Hal_redLedOn();
         Hal_delay(10);
         Hal_greenLedOff();
         Hal_redLedOff();
+        Hal_tickStart(15000, tickHandler);
+        break;
+    case 1:
+        cold++;
+        if (connected)
+            Pulsecounter_coldTick_indicate();
+        Hal_greenLedOn();
+        Hal_delay(10);
+        Hal_greenLedOff();
+        break;
+    case 2:
+        hot++;
+        if (connected)
+            Pulsecounter_hotTick_indicate();
+        Hal_redLedOn();
+        Hal_delay(10);
+        Hal_redLedOff();
+        break;
+    default:
+        for (i = 0; i < 5; i++) {
+            Hal_greenLedOn();
+            Hal_redLedOn();
+            Hal_delay(10);
+            Hal_greenLedOff();
+            Hal_redLedOff();
+            Hal_delay(10);
+        }
     }
-    Hal_tickStart(5000, tickHandler);
 }
 
 static void tickHandler(void) {
@@ -60,13 +78,15 @@ static void tickHandler(void) {
         Hal_delay(50);
         Hal_greenLedOff();
     }
-    Pulsecounter_accept(false);
+    updatable = false;
+    /* Pulsecounter_accept(false); */
 }
 
 /* -------- SCHEMA CALLBACKS -------- */
 
 void Pulsecounter_connectHandler(void) {
     connected = true;
+    Hal_tickStop();
     Hal_connected();
     Hal_redLedOn();
     Hal_delay(100);
@@ -78,36 +98,45 @@ void Pulsecounter_connectHandler(void) {
 
 void Pulsecounter_disconnectHandler(void) {
     connected = false;
+    updatable = false;
     Hal_greenLedOn();
     Hal_delay(100);
     Hal_greenLedOff();
     Hal_redLedOn();
     Hal_delay(100);
     Hal_redLedOff();
-    Hal_tickStart(5000, tickHandler);
+    /* Hal_tickStart(15000, tickHandler); */
     Hal_disconnected();
 }
 
-void Pulsecounter_event4_fetch(Pulsecounter_event4_t* const output) {
-    *output = base4 + event4;
-}
-
-void Pulsecounter_event5_fetch(Pulsecounter_event5_t* const output) {
-    *output = base5 + event5;
-}
-
-void Pulsecounter_base4_fetch(Pulsecounter_base4_t* const output) {
-    *output = base4;
+void Pulsecounter_coldTick_fetch(Pulsecounter_coldTick_t* const output) {
+    *output = cold;
 }
 
-void Pulsecounter_base4_store(Pulsecounter_base4_t* const input) {
-    base4 = *input - event4;
+void Pulsecounter_hotTick_fetch(Pulsecounter_hotTick_t* const output) {
+    *output = hot;
 }
 
-void Pulsecounter_base5_fetch(Pulsecounter_base5_t* const output) {
-    *output = base5;
+void Pulsecounter_coldSet_store(Pulsecounter_coldSet_t* const input) {
+    Hal_greenLedOn();
+    Hal_delay(100);
+    Hal_greenLedOff();
+    Hal_delay(100);
+    Hal_greenLedOn();
+    Hal_delay(100);
+    Hal_greenLedOff();
+    // if (updatable)
+        cold = *input;
 }
 
-void Pulsecounter_base5_store(Pulsecounter_base5_t* const input) {
-    base5 = *input - event5;
+void Pulsecounter_hotSet_store(Pulsecounter_hotSet_t* const input) {
+    Hal_redLedOn();
+    Hal_delay(100);
+    Hal_redLedOff();
+    Hal_delay(100);
+    Hal_redLedOn();
+    Hal_delay(100);
+    Hal_redLedOff();
+    // if (updatable)
+        hot = *input;
 }