diff --git a/code/src/version.cpp b/code/src/version.cpp index 8911e364..6fd1e1f8 100644 --- a/code/src/version.cpp +++ b/code/src/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="707472b"; +const char* GIT_REV="4caca9b"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-11-15 11:59"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-11-15 12:38"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index 8911e364..6fd1e1f8 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="707472b"; +const char* GIT_REV="4caca9b"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-11-15 11:59"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-11-15 12:38"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index b41cfc0a..eb9a01f6 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 8e69fef0..676dc0e8 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index 914d6404..27521082 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ