diff --git a/code/src/version.cpp b/code/src/version.cpp index 65b16071..ba1b9571 100644 --- a/code/src/version.cpp +++ b/code/src/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="f6f3e23"; +const char* GIT_REV="ffc15aa"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-12-02 21:50"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-12-02 21:56"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index 65b16071..1afca8ab 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="f6f3e23"; +const char* GIT_REV="ffc15aa"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-12-02 21:50"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2020-12-02 21:55"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 169b9832..79065325 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index d9bc878e..546b3783 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index a81df042..9314fadd 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ