diff --git a/code/src/version.cpp b/code/src/version.cpp index 54203683..555083b1 100644 --- a/code/src/version.cpp +++ b/code/src/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="de772d7"; +const char* GIT_REV="7bfdfd3"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-11-15 12:29"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-11-15 12:51"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index 54203683..555083b1 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="de772d7"; +const char* GIT_REV="7bfdfd3"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-11-15 12:29"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-11-15 12:51"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 3fd7c9a5..2b714bcf 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 92305cad..e91f25f2 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index 6336a3a1..0d3efe60 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ