Fix negative values (injection) being discarded as spurious reading

plan-d-io · Apr 1, 2024 · c94a833 · c94a833
1 parent c75a693
commit c94a833
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/P1-dongle.ino b/P1-dongle.ino
@@ -27,7 +27,7 @@
 #define HWSERIAL Serial1
 #define TRIGGER 25 //Pin to trigger meter telegram request
 
-unsigned int fw_ver = 222;
+unsigned int fw_ver = 223;
 
 //General global vars
 Preferences preferences;

diff --git a/P1-dongle.ino.m5stack_atom.bin b/P1-dongle.ino.m5stack_atom.bin
diff --git a/dsmrTelegram.ino b/dsmrTelegram.ino
@@ -239,26 +239,26 @@ void processMeterTelegram(String rawTelegram, String rawCRC){
         float tempFloat = 0.0;
         if(totConT1Found && totConT2Found){
           tempFloat = totConT1 + totConT2;
-          if(checkFloat("A-0:0.0.1", "energy", tempFloat)){
+          //if(checkFloat("A-0:0.0.1", "energy", tempFloat)){
             totCon = tempFloat;
             totConFound = true;
-          }
+          //}
         }
         tempFloat = 0.0;
         if(totInT1Found && totInT2Found){
           tempFloat = totInT1 + totInT2;
-          if(checkFloat("A-0:0.0.2", "energy", tempFloat)){
+          //if(checkFloat("A-0:0.0.2", "energy", tempFloat)){
             totIn = tempFloat;
             totInFound = true;
-          }
+          //}
         }
         tempFloat = 0.0;
         if(powConFound && powInFound){
           tempFloat = powCon - powIn;
-          if(checkFloat("A-0:0.0.3", "power", tempFloat)){
+          //if(checkFloat("A-0:0.0.3", "power", tempFloat)){
             netPowCon = tempFloat;
             netPowConFound = true; 
-          }
+          //}
         }
         spurCount = 0;
       }

diff --git a/version b/version
@@ -1 +1 @@
-222
+223