diff --git a/code/main/version.cpp b/code/main/version.cpp index 2a508b91..20df4b18 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="f616643"; +const char* GIT_REV="bcdd0c6"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-12-06 19:22"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-12-06 19:32"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index f92892f8..d024dcbf 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 - v4.1.0 - 2020-11-30"; +const char* GIT_BASE_BRANCH = "master - v5.0.0 - 2020-12-06"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index 2a508b91..20df4b18 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="f616643"; +const char* GIT_REV="bcdd0c6"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-12-06 19:22"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-12-06 19:32"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 5241288a..ce3a6d8f 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 83d29ed0..8a751444 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index 8694e078..9d1ae20c 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ