jomjol 5 tahun lalu
induk
melakukan
7aba4a8f86
4 mengubah file dengan 10 tambahan dan 5 penghapusan
  1. 3 3
      README.md
  2. 7 2
      code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp
  3. TEMPAT SAMPAH
      firmware/bootloader.bin
  4. TEMPAT SAMPAH
      firmware/firmware.bin

+ 3 - 3
README.md

@@ -14,10 +14,10 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
 
 
 ## Change log
 ## Change log
 
 
-##### Rolling - based on 1.0.0 (2020-09-04)
+##### 1.0.2 (2020-09-06)
 
 
-* currently identical to 1.0.0
-* work in progress version for testing of new features
+* Bug in configuration of analog ROIs corrected
+* minor bug correction
 
 
 ##### 1.0.1 (2020-09-05)
 ##### 1.0.1 (2020-09-05)
 
 

+ 7 - 2
code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -259,6 +259,13 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
         return true;
         return true;
     }
     }
 
 
+    if (isdigit)
+        ReturnRawValue = digit;
+    if (isdigit && isanalog)
+        ReturnRawValue = ReturnRawValue + ".";
+    if (isanalog)
+        ReturnRawValue = ReturnRawValue + analog;
+
     if (isdigit)
     if (isdigit)
     {
     {
         int lastanalog = -1;
         int lastanalog = -1;
@@ -273,8 +280,6 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
     if (isanalog)
     if (isanalog)
         zw = zw + analog;
         zw = zw + analog;
 
 
-    ReturnRawValue = zw;
-
     Value = std::stof(zw);
     Value = std::stof(zw);
 
 
     std::stringstream stream;
     std::stringstream stream;

TEMPAT SAMPAH
firmware/bootloader.bin


TEMPAT SAMPAH
firmware/firmware.bin