diff --git a/README.md b/README.md index 3d985089..09fde361 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,11 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571 -##### Rolling - (2020-10-14) +##### Rolling - (2020-10-18) + +* New implementation of "checkDigitConsistency" now also for digits + +* Bug fixing in Postprocessing: MaxRating and NegativeValue did not work properly in some cases. * based on v3.0.0 (2020-10-14) diff --git a/code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp b/code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp index 95e1df74..686b0869 100644 --- a/code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp +++ b/code/lib/jomjol_flowcontroll/ClassFlowPostProcessing.cpp @@ -335,25 +335,23 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) Value = std::stof(zw); if (checkDigitIncreaseConsistency) { -// Value = checkDigitConsistency(Value, DecimalShift, isanalog); + Value = checkDigitConsistency(Value, DecimalShift, isanalog); } zwvalue = RundeOutput(Value, AnzahlAnalog - DecimalShift); if ((!AllowNegativeRates) && (Value < PreValue)) { - error = "Negative Rate - Returned old value - read value: " + zwvalue; + error = error + "Negative Rate - Returned old value - read value: " + zwvalue + " "; Value = PreValue; zwvalue = RundeOutput(Value, AnzahlAnalog - DecimalShift); } - else + + if (useMaxRateValue && (abs(Value - PreValue) > MaxRateValue)) { - if (useMaxRateValue && (abs(Value - PreValue) > MaxRateValue)) - { - error = "Rate too high - Returned old value - read value: " + zwvalue; - Value = PreValue; - zwvalue = RundeOutput(Value, AnzahlAnalog - DecimalShift); - } + error = error + "Rate too high - Returned old value - read value: " + zwvalue + " "; + Value = PreValue; + zwvalue = RundeOutput(Value, AnzahlAnalog - DecimalShift); } ReturnValueNoError = zwvalue; @@ -426,7 +424,7 @@ float ClassFlowPostProcessing::checkDigitConsistency(float input, int _decilamsh float zw; pot = _decilamshift; - if (!_isanalog) // falls es keine analogwerte gibt, kann die letzte nicht bewerte werden + if (!_isanalog) // falls es keine analogwerte gibt, kann die letzte nicht bewertet werden { pot++; } diff --git a/code/src/version.cpp b/code/src/version.cpp index a3d684c7..c7910920 100644 --- a/code/src/version.cpp +++ b/code/src/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="2614481"; +const char* GIT_REV="7e57e85"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2020-10-14 18:40"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2020-10-18 09:07"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index a3d684c7..c7910920 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="2614481"; +const char* GIT_REV="7e57e85"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2020-10-14 18:40"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2020-10-18 09:07"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index d0f95cb6..869ec096 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index a7c09acf..887c1d07 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ