jomjol 5 anni fa
parent
commit
8f518954aa
6 ha cambiato i file con 14 aggiunte e 20 eliminazioni
  1. 7 13
      README.md
  2. 3 3
      code/src/version.cpp
  3. 1 1
      code/src/version.h
  4. 3 3
      code/version.cpp
  5. BIN
      firmware/bootloader.bin
  6. BIN
      firmware/firmware.bin

+ 7 - 13
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)
 ##### 2.2.1 Version Control  (2020-09-27)
 
 

+ 3 - 3
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_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-10-13 20:10";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2020-10-14 18:40";

+ 1 - 1
code/src/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include "Helper.h"
 #include <fstream>
 #include <fstream>
 
 
-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)
 const char* git_base_branch(void)

+ 3 - 3
code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="04f69f0";
+const char* GIT_REV="2614481";
 const char* GIT_TAG="";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-10-13 20:10";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2020-10-14 18:40";

BIN
firmware/bootloader.bin


BIN
firmware/firmware.bin