diff --git a/Changelog.md b/Changelog.md
index 0e490c0b..9952c6b8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,34 @@
+
+
+##### 7.1.2 MQTT-Update - (2021-06-17)
+
+* NEW: 7.1.2: bug fix setting hostname, Flash-LED not off during rebootNEW: 7.1.1: bug fix wlan password with "=" (again)
+
+* MQTT error message: changes "no error", send retain flag
+
+* Update wlan handling to esp-idf 4.1
+
+* Upgrade digital CNN to v8.7.0 (added new images)
+
+* Bug fix: MQTT, WLAN, LED-Controll, GPIO usage, fixed IP, calculation flow rate
+
+
+
+##### 7.0.1 MQTT-Update - (2021-05-13)
+
+* NEW: 7.0.1: bug fix wlan password with "="
+
+* Upgrade digital CNN to v8.5.0 (added new images)
+
+* New MQTT topics: flow rate (units/minute), time stamp (last correct read readout)
+
+* Update MQTT/Error topic to " " in case no error (instead of empty string)
+
+* Portrait or landscape image orientation in rotated image (avoid cropping)
+
##### 6.7.2 Image Processing in Memory - (2021-05-01)
* NEW 6.7.2: Updated html for setup modus - remove reboot on edit configuration)
diff --git a/README.md b/README.md
index 2cb238c4..d29add21 100644
--- a/README.md
+++ b/README.md
@@ -45,12 +45,13 @@ In other cases you can contact the developer via email:
**ATTENTION: the configuration and prevalue files are modified automatically and will not be backward compatible!**
-
-##### 7.1.2 MQTT-Update - (2021-06-17)
-
-* NEW: 7.1.2: bug fix setting hostname, Flash-LED not off during rebootNEW: 7.1.1: bug fix wlan password with "=" (again)
-* MQTT error message: changes "no error", send retain flag
-* Update wlan handling to esp-idf 4.1
-* Upgrade digital CNN to v8.7.0 (added new images)
-* Bug fix: MQTT, WLAN, LED-Controll, GPIO usage, fixed IP, calculation flow rate
-
-
-
-##### 7.0.1 MQTT-Update - (2021-05-13)
-
-* NEW: 7.0.1: bug fix wlan password with "="
-
-* Upgrade digital CNN to v8.5.0 (added new images)
-
-* New MQTT topics: flow rate (units/minute), time stamp (last correct read readout)
-
-* Update MQTT/Error topic to " " in case no error (instead of empty string)
-
-* Portrait or landscape image orientation in rotated image (avoid cropping)
-
-
-
-
## Additional ideas
There are some ideas and feature request, which are not followed currently - mainly due to capacity reasons on side of the developer. They are collected here: [FeatureRequest.md](FeatureRequest.md)
@@ -112,6 +87,10 @@ There are some ideas and feature request, which are not followed currently - mai
## History
+##### 7.1.2 MQTT-Update - (2021-06-17)
+
+**7.0.1 MQTT-Update - (2021-05-13)**
+
##### 6.7.2 Image Processing in Memory - (2021-05-01)
##### 5.0.0 Setup Modus - (2020-12-06)
@@ -134,8 +113,3 @@ There are some ideas and feature request, which are not followed currently - mai
#### [Full Changelog](Changelog.md)
-
-
-## Solved topics
-
-* n.a.
diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
index 40962684..52a739bf 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
@@ -233,7 +233,7 @@ void ClassFlowControll::doFlowMakeImageOnly(string time){
if (FlowControll[i]->name() == "ClassFlowMakeImage") {
// zw_time = gettimestring("%Y%m%d-%H%M%S");
zw_time = gettimestring("%H:%M:%S");
- aktstatus = TranslateAktstatus(FlowControll[i]->name()) + "(" + zw_time + ")";
+ aktstatus = TranslateAktstatus(FlowControll[i]->name()) + " (" + zw_time + ")";
FlowControll[i]->doFlow(time);
}
}
diff --git a/code/main/version.cpp b/code/main/version.cpp
index 1f9e47aa..e94e7e4a 100644
--- a/code/main/version.cpp
+++ b/code/main/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="f6b1a41";
+const char* GIT_REV="0dac0e8";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-08-23 18:44";
\ No newline at end of file
+const char* BUILD_TIME="2021-08-24 08:31";
\ No newline at end of file
diff --git a/code/main/version.h b/code/main/version.h
index 78ac0255..551c53f8 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.1.0 - 2021-08-12";
+const char* GIT_BASE_BRANCH = "master - v8.2.0 - 2021-08-24";
const char* git_base_branch(void)
diff --git a/code/version.cpp b/code/version.cpp
index 1f9e47aa..e94e7e4a 100644
--- a/code/version.cpp
+++ b/code/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="f6b1a41";
+const char* GIT_REV="0dac0e8";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-08-23 18:44";
\ No newline at end of file
+const char* BUILD_TIME="2021-08-24 08:31";
\ No newline at end of file
diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin
index 5f2b92cf..7ffd371e 100644
Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ
diff --git a/firmware/firmware.bin b/firmware/firmware.bin
index 6d70a45f..762034a3 100644
Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ