jomjol 4 rokov pred
rodič
commit
47d15d8adb

+ 28 - 0
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)
 ##### 6.7.2 Image Processing in Memory - (2021-05-01)
 
 
 * NEW 6.7.2: Updated html for setup modus - remove reboot on edit configuration)
 * NEW 6.7.2: Updated html for setup modus - remove reboot on edit configuration)

+ 10 - 36
README.md

@@ -45,12 +45,13 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!
 **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!
 
 
-##### Rolling (2021-08-23)
 
 
-* Improved server responsiveness
-* Added flow status to overview (lower left)
-* Aligned MQTT and prevalue handling, including status of prevalue if not valid/used
-* based on v8.1.0
+
+##### 8.2.0 - Multi Meter Support (2021-08-24)
+
+* Improve server responsiveness
+* Flow status and prevalue status in overview
+* Improved prevalue handling 
 
 
 ##### 8.1.0 - Multi Meter Support (2021-08-12)
 ##### 8.1.0 - Multi Meter Support (2021-08-12)
 
 
@@ -76,32 +77,6 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 <span style="color: red;">**ATTENTION: the configuration and prevalue files are modified automatically and will not be backward compatible!**</span> 
 <span style="color: red;">**ATTENTION: the configuration and prevalue files are modified automatically and will not be backward compatible!**</span> 
 
 
 
 
-
-##### 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
 ## 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)
 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
 ## 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)
 ##### 6.7.2 Image Processing in Memory - (2021-05-01)
 
 
 ##### 5.0.0 Setup Modus - (2020-12-06)
 ##### 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)
 #### [Full Changelog](Changelog.md)
 
 
-
-
-## Solved topics
-
-* n.a.

+ 1 - 1
code/components/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -233,7 +233,7 @@ void ClassFlowControll::doFlowMakeImageOnly(string time){
         if (FlowControll[i]->name() == "ClassFlowMakeImage") {
         if (FlowControll[i]->name() == "ClassFlowMakeImage") {
 //            zw_time = gettimestring("%Y%m%d-%H%M%S");
 //            zw_time = gettimestring("%Y%m%d-%H%M%S");
             zw_time = gettimestring("%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);
             FlowControll[i]->doFlow(time);
         }
         }
     }
     }

+ 2 - 2
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_TAG="";
 const char* GIT_BRANCH="rolling";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-08-23 18:44";
+const char* BUILD_TIME="2021-08-24 08:31";

+ 1 - 1
code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include "Helper.h"
 #include <fstream>
 #include <fstream>
 
 
-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)
 const char* git_base_branch(void)

+ 2 - 2
code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="f6b1a41";
+const char* GIT_REV="0dac0e8";
 const char* GIT_TAG="";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-08-23 18:44";
+const char* BUILD_TIME="2021-08-24 08:31";

BIN
firmware/bootloader.bin


BIN
firmware/firmware.bin