diff --git a/README.md b/README.md index 45e9f8cc..c6e8e563 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,6 @@ In other cases you can contact the developer via email: ReturnRawValue = ShiftDecimal(NUMBERS[j]->ReturnRawValue, NUMBERS[j]->DecimalShift); - printf("RetunrRawValue %s", NUMBERS[j]->ReturnRawValue.c_str()); + printf("ReturnRaw %s", NUMBERS[j]->ReturnRawValue.c_str()); if (IgnoreLeadingNaN) @@ -676,7 +676,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) else _ratedifference = (NUMBERS[j]->Value - NUMBERS[j]->PreValue); - if (abs(_ratedifference) > NUMBERS[j]->MaxRateValue) + if (abs(_ratedifference) > abs(NUMBERS[j]->MaxRateValue)) { NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Rate too high - Read: " + RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma) + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma); NUMBERS[j]->Value = NUMBERS[j]->PreValue; @@ -829,14 +829,14 @@ float ClassFlowPostProcessing::checkDigitConsistency(float input, int _decilamsh while (pot <= pot_max) { zw = input / pow(10, pot-1); - aktdigit_before = ((int) round(zw) + 10) % 10; + aktdigit_before = ((int) zw) % 10; zw = _preValue / pow(10, pot-1); - olddigit_before = ((int) round(zw) + 10) % 10; + olddigit_before = ((int) zw) % 10; zw = input / pow(10, pot); - aktdigit = ((int) round(zw) + 10) % 10; + aktdigit = ((int) zw) % 10; zw = _preValue / pow(10, pot); - olddigit = ((int) round(zw) + 10) % 10; + olddigit = ((int) zw) % 10; no_nulldurchgang = (olddigit_before <= aktdigit_before); diff --git a/code/main/version.cpp b/code/main/version.cpp index a672a0ac..08bdc16d 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="1f5486e"; +const char* GIT_REV="bcb1d98"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2022-02-15 21:28"; \ No newline at end of file +const char* BUILD_TIME="2022-02-18 21:01"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index 25d586cf..f1e8e053 100644 --- a/code/main/version.h +++ b/code/main/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -const char* GIT_BASE_BRANCH = "master - v10.4.0 - 2022-02-12"; +const char* GIT_BASE_BRANCH = "master - v10.5.0 - 2022-02-18"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index a672a0ac..08bdc16d 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="1f5486e"; +const char* GIT_REV="bcb1d98"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2022-02-15 21:28"; \ No newline at end of file +const char* BUILD_TIME="2022-02-18 21:01"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 973fbfbe..4d14d72d 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index bc566b3d..eb2d08e4 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ