Skip to content

Commit

Permalink
Update to v3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jomjol committed Oct 14, 2020
1 parent 2614481 commit 8f51895
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 20 deletions.
20 changes: 7 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 3 additions & 3 deletions code/src/version.cpp
Original file line number Diff line number Diff line change
@@ -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";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2020-10-14 18:40";
2 changes: 1 addition & 1 deletion code/src/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 - v2.1.1 - 2020-09-28";
const char* GIT_BASE_BRANCH = "master - v3.0.0 - 2020-10-14";


const char* git_base_branch(void)
Expand Down
6 changes: 3 additions & 3 deletions code/version.cpp
Original file line number Diff line number Diff line change
@@ -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";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2020-10-14 18:40";
Binary file modified firmware/bootloader.bin
Binary file not shown.
Binary file modified firmware/firmware.bin
Binary file not shown.

0 comments on commit 8f51895

Please sign in to comment.