diff --git a/README.md b/README.md index d81ff467c..3d9850899 100644 --- a/README.md +++ b/README.md @@ -27,25 +27,19 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571 -##### Rolling - (2020-10-13) +##### Rolling - (2020-10-14) -* Implementation of user and password for MQTT Authentication (see `config.ini`) +* based on v3.0.0 (2020-10-14) -2020-10-04 - -* First simple MQTT Client - to be configured in `config.ini` (see example) - - - -2020-09-29 + -* Implementation of HTML-Version (thanks to phlupp) +##### 3.0.0 MQTT-Client (2020-10-14) -* ESP32 Temperature is now written correctly to log file +* Implementation of MQTT Client +* Improved Version Control +* bug-fixing -* based on v2.2.1 (2020-09-28) - ##### 2.2.1 Version Control (2020-09-27) diff --git a/code/src/version.cpp b/code/src/version.cpp index 3fb591995..a3d684c7e 100644 --- a/code/src/version.cpp +++ b/code/src/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="04f69f0"; +const char* GIT_REV="2614481"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-10-13 20:10"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-10-14 18:40"; \ No newline at end of file diff --git a/code/src/version.h b/code/src/version.h index 4c2c3d075..1fbcc2b86 100644 --- a/code/src/version.h +++ b/code/src/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -const char* GIT_BASE_BRANCH = "master - v2.1.1 - 2020-09-28"; +const char* GIT_BASE_BRANCH = "master - v3.0.0 - 2020-10-14"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index 3fb591995..a3d684c7e 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="04f69f0"; +const char* GIT_REV="2614481"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-10-13 20:10"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-10-14 18:40"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index eb151bca3..d0f95cb6a 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index b1558c8b9..a7c09acfc 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ