use two counters and bases

diff --git a/Makefile b/Makefile
index 4e7555ec0ed48929175c4fc94096abd4fce57f7d..88ef651015419f75441dca7b7732bdbdd008bc5a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,6 @@ $(APPNAME).o: Em/$(APPNAME).c
 Hal.o: Hal/Hal.c
        $(CC) $< -o $@ $(CFLAGS)
 
 Hal.o: Hal/Hal.c
        $(CC) $< -o $@ $(CFLAGS)
 

-Em/$(APPNAME).c:
+Em/$(APPNAME).c: $(APPNAME).ems

        $(EMBUILDER) -v $<
 
        $(EMBUILDER) -v $<
 

diff --git a/Pulsecounter-Prog.c b/Pulsecounter-Prog.c
index f5071784b56c41126d9d58559242d7bf0ea0b090..d5170af1a5adc722a38b1d86ef05883570e6ac85 100644 (file)
--- a/Pulsecounter-Prog.c
+++ b/Pulsecounter-Prog.c
@@ -4,7 +4,12 @@
 static void buttonHandler(void);
 static void tickHandler(void);
 static bool connected = false;
 static void buttonHandler(void);
 static void tickHandler(void);
 static bool connected = false;

-static int32_t buttonCnt = 0;
+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();
 
 void main() {
     Hal_init();


@@ -17,9 +22,17 @@ void main() {
 static void buttonHandler(void) {
     uint8_t i;
 
 static void buttonHandler(void) {
     uint8_t i;
 

-    buttonCnt++;
-    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++) {
     else
         Pulsecounter_accept(true);
     for (i = 0; i < 3; i++) {


@@ -75,14 +88,26 @@ void Pulsecounter_disconnectHandler(void) {
     Hal_disconnected();
 }
 
     Hal_disconnected();
 }
 

-void Pulsecounter_event3_fetch(Pulsecounter_event3_t* const output) {
-    *output = buttonCnt;
-}
-

 void Pulsecounter_event4_fetch(Pulsecounter_event4_t* const output) {
 void Pulsecounter_event4_fetch(Pulsecounter_event4_t* const output) {

-    *output = 4;
+    *output = base4 + event4;

 }
 
 void Pulsecounter_event5_fetch(Pulsecounter_event5_t* const output) {
 }
 
 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;

 }
 }

diff --git a/Pulsecounter.ems b/Pulsecounter.ems
index 3059817cfcdceb2ee74638471d466af56991149a..dda43d412c9220b010cc63e5cc15f54fbb1b946d 100644 (file)
--- a/Pulsecounter.ems
+++ b/Pulsecounter.ems
@@ -3,10 +3,6 @@ description = "Pulsecounter";
 
 schema Pulsecounter {
 
 
 schema Pulsecounter {
 

-    int32 event3 {
-        indicator
-    };
-

     int32 event4 {
         indicator
     };
     int32 event4 {
         indicator
     };


@@ -15,4 +11,12 @@ schema Pulsecounter {
         indicator
     };
 
         indicator
     };
 

+    int32 base4 {
+        readwrite
+    };
+
+    int32 base5 {
+        readwrite
+    };
+

 };
 };