diff --git a/README.md b/README.md index 4ef09a1a..cc844d7a 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ In other cases you can contact the developer via email: ReturnRawValue = ""; + NUMBERS[j]->ReturnRateValue = ""; NUMBERS[j]->ReturnValue = ""; NUMBERS[j]->ErrorMessageText = ""; NUMBERS[j]->Value = -1; @@ -670,8 +671,9 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) double difference = difftime(imagetime, NUMBERS[j]->lastvalue); // in Sekunden difference /= 60; NUMBERS[j]->FlowRateAct = (NUMBERS[j]->Value - NUMBERS[j]->PreValue) / difference; + NUMBERS[j]->ReturnRateValue = to_string(NUMBERS[j]->FlowRateAct); - if (NUMBERS[j]->useMaxRateValue) + if (NUMBERS[j]->useMaxRateValue && PreValueUse && NUMBERS[j]->PreValueOkay) { float _ratedifference; if (NUMBERS[j]->RateType == RateChange) diff --git a/code/main/version.cpp b/code/main/version.cpp index f570dbae..b9e504ce 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="cbe884a"; -const char* GIT_TAG="v10.5.0"; +const char* GIT_REV="c07ef23"; +const char* GIT_TAG=""; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2022-02-20 16:02"; \ No newline at end of file +const char* BUILD_TIME="2022-02-20 16:21"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index 5222efe8..b9e504ce 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="cbe884a"; -const char* GIT_TAG="v10.5.0"; +const char* GIT_REV="c07ef23"; +const char* GIT_TAG=""; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2022-02-20 16:01"; \ No newline at end of file +const char* BUILD_TIME="2022-02-20 16:21"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 86eb6e91..ae381bb1 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 49291861..9f59ee11 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ