From 776931c0ad3722e359f2eab0fb6be56323f031b9 Mon Sep 17 00:00:00 2001 From: jomjol <30766535+jomjol@users.noreply.github.com> Date: Thu, 2 Dec 2021 21:56:05 +0100 Subject: [PATCH] v9.2.0 --- code/main/version.cpp | 6 +++--- code/version.cpp | 6 +++--- firmware/bootloader.bin | Bin 25264 -> 25264 bytes firmware/firmware.bin | Bin 1663120 -> 1663120 bytes 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/main/version.cpp b/code/main/version.cpp index 0a41b2b19..a5a09117a 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="cad534b"; +const char* GIT_REV="e22b4b6"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-12-02 21:50"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2021-12-02 21:53"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index 0a41b2b19..a5a09117a 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="cad534b"; +const char* GIT_REV="e22b4b6"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-12-02 21:50"; \ No newline at end of file +const char* GIT_BRANCH="master"; +const char* BUILD_TIME="2021-12-02 21:53"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 59dc81ef53b7afb37acd0d6ef4fc2d7909ed4f8b..e098b648259b5d7533b912ebbf71dcde96a0e1d9 100644 GIT binary patch delta 57 zcmdmRlyL(PDG9TfS{WNoW@M4rY$qJ(ulVH8trbeA|5_UE`LSj0#7{f2X6!T--n;9z NAm5v-{zeyVLIJlI8Y}<+ delta 57 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 delta 8323 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