diff --git a/README.md b/README.md index c7c79121..7166a104 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,10 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571 ## 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) diff --git a/code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp b/code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp index 13e90f80..23b26cfb 100644 --- a/code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp +++ b/code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp @@ -259,6 +259,13 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) return true; } + if (isdigit) + ReturnRawValue = digit; + if (isdigit && isanalog) + ReturnRawValue = ReturnRawValue + "."; + if (isanalog) + ReturnRawValue = ReturnRawValue + analog; + if (isdigit) { int lastanalog = -1; @@ -273,8 +280,6 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) if (isanalog) zw = zw + analog; - ReturnRawValue = zw; - Value = std::stof(zw); std::stringstream stream; diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index f5907d3a..c233048a 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 4225b317..dd146858 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ