diff --git a/README.md b/README.md index 17eb360b..795e4d88 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,14 @@ In other cases you can contact the developer via email: timeStamp + "\t" + to_string(NUMBERS[j]->PreValue) + "\n"; + _zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma) + "\n"; printf("Write PreValue Zeile: %s\n", _zw.c_str()); fputs(_zw.c_str(), pFile); @@ -594,7 +594,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) if ((!NUMBERS[j]->AllowNegativeRates) && (NUMBERS[j]->Value < NUMBERS[j]->PreValue)) { - NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + std::to_string(NUMBERS[j]->Value) + " "; + NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " "; NUMBERS[j]->Value = NUMBERS[j]->PreValue; zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->AnzahlAnalog - NUMBERS[j]->DecimalShift); } diff --git a/code/main/version.cpp b/code/main/version.cpp index e9fcd1f0..9b0948b4 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="03b5e36"; +const char* GIT_REV="025c2b8"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-07-14 19:54"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-07-19 21:46"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index ed812495..4d2c95c4 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 - v8.0.0 - 2021-07-14"; +const char* GIT_BASE_BRANCH = "master - v8.0.1 - 2021-07-18"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index 934e3147..16b8d59b 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="03b5e36"; +const char* GIT_REV="025c2b8"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-07-14 19:53"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-07-19 21:45"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index f73c470c..202dfd9f 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 93aab4f0..e408d91c 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ