Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rolling from Master Release v6.0.0 #82

Merged
merged 5 commits into from
Jan 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571




## Donate

------
Expand Down Expand Up @@ -65,7 +64,7 @@ If you would like to support the developer with a cup of coffee you can do that

##### 5.0.0 Setup Modus - (2020-12-06)

* Implementation of intial setup modus for fresh installation
* Implementation of initial setup modus for fresh installation

* Code restructuring (full compatibility between pure ESP-IDF and Platformio w/ espressif)

Expand Down Expand Up @@ -199,4 +198,4 @@ If you would like to support the developer with a cup of coffee you can do that

## Solved topics

* n.a.
* n.a.
6 changes: 3 additions & 3 deletions code/main/version.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const char* GIT_REV="0e36010";
const char* GIT_REV="aa44263";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2021-01-02 08:39";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-01-02 08:56";
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="0e36010";
const char* GIT_REV="aa44263";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2021-01-02 08:39";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2021-01-02 08:56";
Binary file modified firmware/bootloader.bin
Binary file not shown.
Binary file modified firmware/firmware.bin
Binary file not shown.
Binary file modified firmware/html.zip
Binary file not shown.