v8.0.4

README.md

@@ -47,11 +47,12 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### 8.0.3 - Multi Meter Support (2021-07-25)
+##### 8.0.4 - Multi Meter Support (2021-07-29)
 
+* NEW 8.0.4: bug fix: failed configuration after upgrade
 * NEW 8.0.3: bug fix: reboot during `config.ini` handling, html error
 * NEW 8.0.2: saving roundes prevalue, bug fix html server
-* NEW 8.0.1: bug fix html handling of parameter `FixedExposure` and `ImageSize`
+* NEW 8.0.1: bug fix: html handling of parameter `FixedExposure` and `ImageSize`
 * Dual / multi meter support (more than 1 number to be recognized)
   This is implemented with the feature "number" on the ROI definition as well as selected options
 * MQTT: standardization of the naming - including new topics (`json`,  `freeMem `, `uptime`)c

code/components/jomjol_configfile/configFile.cpp

@@ -39,13 +39,15 @@ bool ConfigFile::GetNextParagraph(std::string& aktparamgraph, bool &disabled, bo
 bool ConfigFile::getNextLine(std::string *rt, bool &disabled, bool &eof)
 {
     eof = false;
-	char zw[1024];
+	char zw[1024] = "";
 	if (pFile == NULL)
 	{
 		*rt = "";
 		return false;
 	}
-	fgets(zw, 1024, pFile);
+
+	if (fgets(zw, 1024, pFile))
+	{
 		printf("%s", zw);
 		if ((strlen(zw) == 0) && feof(pFile))
 		{
@@ -53,6 +55,13 @@ bool ConfigFile::getNextLine(std::string *rt, bool &disabled, bool &eof)
 			eof = true;
 			return false;
 		}
+	}
+	else
+	{
+		*rt = "";
+		eof = true;
+		return false;
+	}
 	*rt = zw;
 	*rt = trim(*rt);
 	while ((zw[0] == ';' || zw[0] == '#' || (rt->size() == 0)) && !(zw[1] == '['))			// Kommentarzeilen (; oder #) und Leerzeilen überspringen, es sei denn es ist ein neuer auskommentierter Paragraph

code/components/jomjol_controlGPIO/server_GPIO.cpp

@@ -216,6 +216,7 @@ void GpioHandler::init()
         clear();
     }
     
+    
     ESP_LOGI(TAG_SERVERGPIO, "read GPIO config and init GPIO");
     if (!readConfig()) {
         clear();
@@ -225,6 +226,7 @@ void GpioHandler::init()
         return;
     }
 
+
     for(std::map<gpio_num_t, GpioPin*>::iterator it = gpioMap->begin(); it != gpioMap->end(); ++it) {
         it->second->init();
     }

code/components/jomjol_flowcontroll/ClassFlow.cpp

@@ -129,12 +129,10 @@ bool ClassFlow::getNextLine(FILE* pfile, string *rt)
 	*rt = zw;
 	*rt = trim(*rt);
 	while ((zw[0] == ';' || zw[0] == '#' || (rt->size() == 0)) && !(zw[1] == '['))			// Kommentarzeilen (; oder #) und Leerzeilen überspringen, es sei denn es ist ein neuer auskommentierter Paragraph
-	{
-		if (!fgets(zw, 1024, pfile))
 	{
 		*rt = "";
+		if (!fgets(zw, 1024, pfile))
 			return false;
-		}
 		printf("%s", zw);		
 		*rt = zw;
 		*rt = trim(*rt);

code/components/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -173,11 +173,14 @@ void ClassFlowControll::InitFlow(std::string config)
         }
         else
         {
-            fgets(zw, 1024, pFile);
-            printf("%s", zw);
+            line = "";
+            if (fgets(zw, 1024, pFile) && !feof(pFile))
+                {
+                    printf("Read: %s", zw);
                     line = std::string(zw);
                 }
         }
+    }
 
     fclose(pFile);
 

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="ea72256";
-const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-07-25 18:09";
+const char* GIT_REV="fa3842b";
+const char* GIT_TAG="v8.0.3";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-07-29 20:11";

code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v8.0.3 - 2021-07-25";
+const char* GIT_BASE_BRANCH = "master - v8.0.4 - 2021-07-29";
 
 
 const char* git_base_branch(void)

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="ea72256";
-const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-07-25 18:09";
+const char* GIT_REV="fa3842b";
+const char* GIT_TAG="v8.0.3";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-07-29 20:11";