diff --git a/code/main/version.cpp b/code/main/version.cpp index 55c22f5e3..b4dcaecfe 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="f15e5f0"; +const char* GIT_REV="147d974"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-09-24 19:25"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2021-09-25 18:55"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index 498acfd6f..6cfe5ac5b 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 - v8.4.0 - 2021-09-24"; +const char* GIT_BASE_BRANCH = "master - v8.4.0 - 2021-09-25"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index 55c22f5e3..b4dcaecfe 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="f15e5f0"; +const char* GIT_REV="147d974"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-09-24 19:25"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2021-09-25 18:55"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index cd54c830d..e41674fb2 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 32f791a8d..15e707409 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ