Skip to content

Commit b7e6d33

Browse files
authored
Merge pull request #223 from jomjol/rolling
Update v7.0.1
2 parents 58d5e7b + 52e9cd2 commit b7e6d33

File tree

7 files changed

+12
-9
lines changed

7 files changed

+12
-9
lines changed

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,12 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
4545

4646

4747

48-
##### 7.0.0 MQTT-Update - (2021-05-08)
48+
##### 7.0.1 MQTT-Update - (2021-05-13)
49+
50+
* NEW: 7.0.1: bug fix wlan password with "="
4951

5052
* Upgrade digital CNN to v8.5.0 (added new images)
53+
5154
* New MQTT topics: flow rate (units/minute), time stamp (last correct read readout)
5255

5356
* Update MQTT/Error topic to " " in case no error (instead of empty string)

code/components/connect_wlan/connect_wlan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ void LoadWlanFromFile(std::string fn)
329329
zerlegt = ZerlegeZeile(line, "=");
330330
zerlegt[0] = trim(zerlegt[0], " ");
331331
for (int i = 2; i < zerlegt.size(); ++i)
332-
zerlegt[1] = zerlegt[1] + zerlegt[i];
332+
zerlegt[1] = zerlegt[1] + "=" + zerlegt[i];
333333

334334
if ((zerlegt.size() > 1) && (toUpper(zerlegt[0]) == "HOSTNAME")){
335335
hostname = trim(zerlegt[1]);

code/main/version.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const char* GIT_REV="1e09bfb";
1+
const char* GIT_REV="b34bd5d";
22
const char* GIT_TAG="";
3-
const char* GIT_BRANCH="master";
4-
const char* BUILD_TIME="2021-05-08 18:20";
3+
const char* GIT_BRANCH="rolling";
4+
const char* BUILD_TIME="2021-05-13 08:11";

code/main/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extern "C"
1313
#include "Helper.h"
1414
#include <fstream>
1515

16-
const char* GIT_BASE_BRANCH = "master - v7.0.0 - 2020-05-08";
16+
const char* GIT_BASE_BRANCH = "master - v7.0.1 - 2020-05-13";
1717

1818

1919
const char* git_base_branch(void)

code/version.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const char* GIT_REV="1e09bfb";
1+
const char* GIT_REV="b34bd5d";
22
const char* GIT_TAG="";
3-
const char* GIT_BRANCH="master";
4-
const char* BUILD_TIME="2021-05-08 18:20";
3+
const char* GIT_BRANCH="rolling";
4+
const char* BUILD_TIME="2021-05-13 08:11";

firmware/bootloader.bin

0 Bytes
Binary file not shown.

firmware/firmware.bin

-336 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)