diff --git a/code/main/version.cpp b/code/main/version.cpp index 75e1a03f..8bd8344f 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="0e36010"; +const char* GIT_REV="e53c6fe"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling-speed-up-alignment"; -const char* BUILD_TIME="2021-01-04 12:13"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-01-05 08:24"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index d024dcbf..d267c063 100644 --- a/code/main/version.h +++ b/code/main/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -const char* GIT_BASE_BRANCH = "master - v5.0.0 - 2020-12-06"; +const char* GIT_BASE_BRANCH = "master - v6.0.0 - 2020-01-02"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index e91aa420..8bd8344f 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="0e36010"; +const char* GIT_REV="e53c6fe"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling-speed-up-alignment"; -const char* BUILD_TIME="2021-01-02 09:02"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-01-05 08:24"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 48f2a444..0cf12d73 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index ae1d0ee3..8851ca1f 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index 4ad6a3e7..f84064de 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt index 0062ac97..6b244dcd 100644 --- a/sd-card/html/version.txt +++ b/sd-card/html/version.txt @@ -1 +1 @@ -5.0.0 +5.0.1