Skip to content

Commit

Permalink
v10.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jomjol committed Jan 1, 2022
1 parent 98f9274 commit eac5134
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ In other cases you can contact the developer via email: <img src="https://raw.gi

------

##### 10.0.1 - Stability Increase (2021-12-31)
##### 10.0.2 - Stability Increase (2022-01-01)

- NEW: Correcte JSON error
- NEW v10.0.2: Corrected JSON error

- Updated compiler toolchain to ESP-IDF 4.3

Expand Down
8 changes: 7 additions & 1 deletion code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,13 @@ bool ClassFlowMQTT::doFlow(string zwtime)
MQTTPublish(zw, resulttimestamp);


std::string json="{\"value\":"+result;
std::string json = "";

if (result.length() > 0)
json += "{\"value\":"+result;
else
json += "{\"value\":\"\"";

This comment has been minimized.

Copy link
@zuzu59

zuzu59 Jan 12, 2022

I think here at the end of the line there is one extra double quote!

json + = "{" value \ ": " \ "";

I will instead put:

json + = "{" value \ ": " \ ";

This comment has been minimized.

Copy link
@jomjol

jomjol Jan 12, 2022

Author Owner

No, this " is the represenative of the " within a string.


json += ",\"raw\":\""+resultraw;
json += "\",\"error\":\""+resulterror;
if (resultrate.length() > 0)
Expand Down
8 changes: 4 additions & 4 deletions code/main/version.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const char* GIT_REV="884dd9f";
const char* GIT_TAG="";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-12-31 08:56";
const char* GIT_REV="98f9274";
const char* GIT_TAG="v10.0.1";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2022-01-01 08:46";
2 changes: 1 addition & 1 deletion code/main/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C"
#include "Helper.h"
#include <fstream>

const char* GIT_BASE_BRANCH = "master - v10.0.1 - 2021-12-31";
const char* GIT_BASE_BRANCH = "master - v10.0.2 - 2022-01-01";


const char* git_base_branch(void)
Expand Down
8 changes: 4 additions & 4 deletions code/version.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const char* GIT_REV="884dd9f";
const char* GIT_TAG="";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-12-31 08:56";
const char* GIT_REV="98f9274";
const char* GIT_TAG="v10.0.1";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2022-01-01 08:46";
Binary file modified firmware/bootloader.bin
Binary file not shown.
Binary file modified firmware/firmware.bin
Binary file not shown.

0 comments on commit eac5134

Please sign in to comment.