Compare commits

...

4 Commits

Author SHA1 Message Date
jomjol
87a6445ff6 Update version in firmware 2021-05-13 08:22:20 +02:00
jomjol
b7e6d33d48 Merge pull request #223 from jomjol/rolling
Update v7.0.1
2021-05-13 08:17:03 +02:00
jomjol
52e9cd20ee Update v7.0.1 2021-05-13 08:16:01 +02:00
jomjol
b34bd5d988 Merge pull request #217 from jomjol/master
Synch rolling
2021-05-08 18:23:54 +02:00
7 changed files with 10 additions and 7 deletions

View File

@@ -45,9 +45,12 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
##### 7.0.0 MQTT-Update - (2021-05-08) ##### 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) * Upgrade digital CNN to v8.5.0 (added new images)
* New MQTT topics: flow rate (units/minute), time stamp (last correct read readout) * 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) * Update MQTT/Error topic to " " in case no error (instead of empty string)

View File

@@ -329,7 +329,7 @@ void LoadWlanFromFile(std::string fn)
zerlegt = ZerlegeZeile(line, "="); zerlegt = ZerlegeZeile(line, "=");
zerlegt[0] = trim(zerlegt[0], " "); zerlegt[0] = trim(zerlegt[0], " ");
for (int i = 2; i < zerlegt.size(); ++i) for (int i = 2; i < zerlegt.size(); ++i)
zerlegt[1] = zerlegt[1] + zerlegt[i]; zerlegt[1] = zerlegt[1] + "=" + zerlegt[i];
if ((zerlegt.size() > 1) && (toUpper(zerlegt[0]) == "HOSTNAME")){ if ((zerlegt.size() > 1) && (toUpper(zerlegt[0]) == "HOSTNAME")){
hostname = trim(zerlegt[1]); hostname = trim(zerlegt[1]);

View File

@@ -1,4 +1,4 @@
const char* GIT_REV="1e09bfb"; const char* GIT_REV="b7e6d33";
const char* GIT_TAG=""; const char* GIT_TAG="";
const char* GIT_BRANCH="master"; const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-05-08 18:20"; const char* BUILD_TIME="2021-05-13 08:18";

View File

@@ -13,7 +13,7 @@ extern "C"
#include "Helper.h" #include "Helper.h"
#include <fstream> #include <fstream>
const char* GIT_BASE_BRANCH = "master - v7.0.0 - 2020-05-08"; const char* GIT_BASE_BRANCH = "master - v7.0.1 - 2020-05-13";
const char* git_base_branch(void) const char* git_base_branch(void)

View File

@@ -1,4 +1,4 @@
const char* GIT_REV="1e09bfb"; const char* GIT_REV="b7e6d33";
const char* GIT_TAG=""; const char* GIT_TAG="";
const char* GIT_BRANCH="master"; const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-05-08 18:20"; const char* BUILD_TIME="2021-05-13 08:18";

Binary file not shown.

Binary file not shown.