Merge pull request #147 from jomjol/rolling

Rolling
jomjol · Mar 10, 2021 · 4615e87 · 4615e87
2 parents 2674549 + fb9b72d
commit 4615e87
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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";
+const char* GIT_REV="5cc873a";
+const char* GIT_TAG="";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-03-10 21:09";
diff --git a/code/main/version.h b/code/main/version.h
@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-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
@@ -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";
+const char* GIT_REV="5cc873a";
+const char* GIT_TAG="";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-03-10 21:09";
diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin
diff --git a/firmware/firmware.bin b/firmware/firmware.bin
diff --git a/firmware/html.zip b/firmware/html.zip
diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html
@@ -487,7 +487,7 @@ <h4><input type="checkbox" id="Category_Analog_enabled" value="1"  onclick = 'Up
 				<input type="text" id="MQTT_Uri_value1">
 			</td>
 			<td style="font-size: 80%;">
-				URI to the MQTT broker including port: http:\\IP-ADRESS:port
+				URI to the MQTT broker including port e.g.: mqtt://IP-Address:Port
 			</td>
 		</tr>
 		<tr>
@@ -543,7 +543,7 @@ <h4><input type="checkbox" id="Category_Analog_enabled" value="1"  onclick = 'Up
 				<input type="text" id="MQTT_user_value1">
 			</td>
 			<td style="font-size: 80%;">
-				user for MQTT authenficiation
+				user for MQTT authentication
 			</td>
 		</tr>
 		<tr>
@@ -557,7 +557,7 @@ <h4><input type="checkbox" id="Category_Analog_enabled" value="1"  onclick = 'Up
 				<input type="text" id="MQTT_password_value1">
 			</td>
 			<td style="font-size: 80%;">
-				password for MQTT authenficiation
+				password for MQTT authentication
 			</td>
 		</tr>
 

diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt
@@ -1 +1 @@
-5.4.0
+5.4.1