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

diff --git a/Pulsecounter-Prog.c b/Pulsecounter-Prog.c
index d5170af..4ac463f 100644
--- a/Pulsecounter-Prog.c
+++ b/Pulsecounter-Prog.c
@@ -1,48 +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 = 1000;
+static int32_t base5 = 0;
 static int32_t event4 = 0;
 static int32_t event5 = 0;
 
-static bool cold = true;
-
 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)
+    switch (id) {
+    case 0:
+        Pulsecounter_accept(true);
+            Hal_greenLedOn();
+            Hal_redLedOn();
+            Hal_delay(10);
+            Hal_greenLedOff();
+            Hal_redLedOff();
+        Hal_tickStart(15000, tickHandler);
+        break;
+    case 1:
         event4++;
-    else
-        event5++;
-    if (connected) {
-        if (cold)
+        if (connected)
             Pulsecounter_event4_indicate();
-        else
-            Pulsecounter_event5_indicate();
-    }
-    else
-        Pulsecounter_accept(true);
-    for (i = 0; i < 3; i++) {
         Hal_greenLedOn();
-        Hal_redLedOn();
         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) {
@@ -84,7 +97,7 @@ void Pulsecounter_disconnectHandler(void) {
     Hal_redLedOn();
     Hal_delay(100);
     Hal_redLedOff();
-    Hal_tickStart(5000, tickHandler);
+    Hal_tickStart(15000, tickHandler);
     Hal_disconnected();
 }