two counters work

[pulsecounter.git] / Pulsecounter-Prog.c

diff --git a/Pulsecounter-Prog.c b/Pulsecounter-Prog.c
index 2c3256d849ee1eabac4e03815f8e3f0743585246..331dbf5366af78b29b9d5f79612c5b24d8132704 100644 (file)
--- a/Pulsecounter-Prog.c
+++ b/Pulsecounter-Prog.c
@@ -1,33 +1,61 @@
 #include "Pulsecounter.h"
 #include "Hal.h"
 
-static void buttonHandler(void);
+static void gpioHandler(uint8_t id);
 static void tickHandler(void);
 static bool connected = false;
+static int32_t base4 = 0;
+static int32_t base5 = 0;
+static int32_t event4 = 0;
+static int32_t event5 = 0;
 
 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;
 
-    if (connected)
-        Pulsecounter_event3_indicate();
-    else
+    switch (id) {
+    case 0:
         Pulsecounter_accept(true);
-    for (i = 0; i < 3; i++) {
+            Hal_greenLedOn();
+            Hal_redLedOn();
+            Hal_delay(10);
+            Hal_greenLedOff();
+            Hal_redLedOff();
+        Hal_tickStart(5000, tickHandler);
+        break;
+    case 1:
+        event4++;
+        if (connected)
+            Pulsecounter_event4_indicate();
         Hal_greenLedOn();
-        Hal_redLedOn();
-        Hal_delay(100);
+        Hal_delay(10);
         Hal_greenLedOff();
+        break;
+    case 2:
+        event5++;
+        if (connected)
+            Pulsecounter_event5_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) {
@@ -73,14 +101,26 @@ void Pulsecounter_disconnectHandler(void) {
     Hal_disconnected();
 }
 
-void Pulsecounter_event3_fetch(Pulsecounter_event3_t* const output) {
-    *output = buttonCnt;
-}
-
 void Pulsecounter_event4_fetch(Pulsecounter_event4_t* const output) {
-    *output = 4;
+    *output = base4 + event4;
 }
 
 void Pulsecounter_event5_fetch(Pulsecounter_event5_t* const output) {
-    *output = 5;
+    *output = base5 + event5;
+}
+
+void Pulsecounter_base4_fetch(Pulsecounter_base4_t* const output) {
+    *output = base4;
+}
+
+void Pulsecounter_base4_store(Pulsecounter_base4_t* const input) {
+    base4 = *input - event4;
+}
+
+void Pulsecounter_base5_fetch(Pulsecounter_base5_t* const output) {
+    *output = base5;
+}
+
+void Pulsecounter_base5_store(Pulsecounter_base5_t* const input) {
+    base5 = *input - event5;
 }