diff --git a/README.md b/README.md index 7b8d11e4..c527905f 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,9 @@ If you would like to support the developer with a cup of coffee you can do that -##### 6.2.1 Image Processing in Memory - (2021-03-08) +##### 6.2.2 Image Processing in Memory - (2021-03-10) +* NEW 6.2.2: bug fixing * NEW 6.2.1: Changed brightness and contrast to default if not enabled (resolves to bright images) * Determination of fixed illumination settings during startup - speed up of 5s in each run * Update digital CNN to v8.1.1 (additional digital images trained) diff --git a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp index 817126cf..acbf565f 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp @@ -368,7 +368,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) if (useMaxRateValue && (abs(Value - PreValue) > MaxRateValue)) { - ErrorMessageText = ErrorMessageText + "Rate too high - Returned old value - read value: " + zwvalue + " - checked value: " + std::to_string(Value) + " "; + ErrorMessageText = ErrorMessageText + "Rate too high - Returned old value - read value: " + zwvalue + " - checked value: " + RundeOutput(Value, AnzahlAnalog - DecimalShift) + " "; Value = PreValue; zwvalue = RundeOutput(Value, AnzahlAnalog - DecimalShift); } diff --git a/code/main/version.cpp b/code/main/version.cpp index f3524947..be137383 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="4537725"; -const char* GIT_TAG="v6.2.0"; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-03-09 21:07"; \ No newline at end of file +const char* GIT_REV="5cc873a"; +const char* GIT_TAG=""; +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-03-10 21:09"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index 2812957d..5f3896e9 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 - v6.2.1 - 2020-03-09"; +const char* GIT_BASE_BRANCH = "master - v6.2.2 - 2020-03-10"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index f3524947..be137383 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="4537725"; -const char* GIT_TAG="v6.2.0"; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-03-09 21:07"; \ No newline at end of file +const char* GIT_REV="5cc873a"; +const char* GIT_TAG=""; +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-03-10 21:09"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 77805f18..728a889c 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 22f9c3f3..468c6396 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index f4f14def..443cc2b6 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html index ce30ed31..c9d2c43c 100644 --- a/sd-card/html/edit_config_param.html +++ b/sd-card/html/edit_config_param.html @@ -487,7 +487,7 @@ textarea { - URI to the MQTT broker including port: http:\\IP-ADRESS:port + URI to the MQTT broker including port e.g.: mqtt://IP-Address:Port @@ -543,7 +543,7 @@ textarea { - user for MQTT authenficiation + user for MQTT authentication @@ -557,7 +557,7 @@ textarea { - password for MQTT authenficiation + password for MQTT authentication diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt index 8a30e8f9..ade65226 100644 --- a/sd-card/html/version.txt +++ b/sd-card/html/version.txt @@ -1 +1 @@ -5.4.0 +5.4.1