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

diff --git a/Pulsecounter-Prog.c b/Pulsecounter-Prog.c
index 2c3256d..d5170af 100644
--- a/Pulsecounter-Prog.c
+++ b/Pulsecounter-Prog.c
@@ -4,6 +4,12 @@
 static void buttonHandler(void);
 static void tickHandler(void);
 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;
 
 void main() {
     Hal_init();
@@ -16,14 +22,23 @@ void main() {
 static void buttonHandler(void) {
     uint8_t i;
 
-    if (connected)
-        Pulsecounter_event3_indicate();
+    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++) {
         Hal_greenLedOn();
         Hal_redLedOn();
-        Hal_delay(100);
+        Hal_delay(10);
         Hal_greenLedOff();
         Hal_redLedOff();
     }
@@ -73,14 +88,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;
 }