diff --git a/README.md b/README.md index 3fe460fdc..351573f22 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,9 @@ In other cases you can contact the developer via email: 0) + json += "{\"value\":"+result; + else + json += "{\"value\":\"\""; + json += ",\"raw\":\""+resultraw; json += "\",\"error\":\""+resulterror; if (resultrate.length() > 0) diff --git a/code/main/version.cpp b/code/main/version.cpp index 15022dcad..f191a6e4d 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -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"; \ No newline at end of file +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"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index 3c70ed2c5..6b83203d0 100644 --- a/code/main/version.h +++ b/code/main/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -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) diff --git a/code/version.cpp b/code/version.cpp index 15022dcad..f191a6e4d 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -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"; \ No newline at end of file +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"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 3d567cf9a..7fb59e511 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 1a545ca97..5b84cadae 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ