diff --git a/code/src/version.cpp b/code/src/version.cpp index b1b2a8eb3..9f1d354d8 100644 --- a/code/src/version.cpp +++ b/code/src/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="1b5f6b4"; +const char* GIT_REV="2753552"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-11-30 12:06"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-11-30 22:02"; \ No newline at end of file diff --git a/code/src/version.h b/code/src/version.h index 7d39a0343..f92892f82 100644 --- a/code/src/version.h +++ b/code/src/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -const char* GIT_BASE_BRANCH = "master - v4.0.0 - 2020-11-15"; +const char* GIT_BASE_BRANCH = "master - v4.1.0 - 2020-11-30"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index b1b2a8eb3..9f1d354d8 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="1b5f6b4"; +const char* GIT_REV="2753552"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-11-30 12:06"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-11-30 22:02"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 219eae7c4..270f8fb73 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index ce12ccce8..75aff14ba 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index a803d8046..69081c7c8 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ