Merge pull request #82 from jomjol/master

Update Rolling from Master Release v6.0.0

README.md

@@ -13,7 +13,6 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
 
 
 
-
 ## Donate
 
 ------
@@ -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)
   
@@ -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.

code/main/version.cpp

@@ -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* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-01-02 08:39";
+const char* BUILD_TIME="2021-01-02 08:56";

code/version.cpp

@@ -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* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-01-02 08:39";
+const char* BUILD_TIME="2021-01-02 08:56";