From 3e6713d16c19e3cd9cf2a9ff9bb2dbe9e28eb7ac Mon Sep 17 00:00:00 2001
From: jomjol <30766535+jomjol@users.noreply.github.com>
Date: Sun, 15 Nov 2020 18:36:31 +0100
Subject: [PATCH] Correct Version Info

---
 code/src/version.cpp    |   4 ++--
 code/src/version.h      |   2 +-
 code/version.cpp        |   4 ++--
 firmware/bootloader.bin | Bin 25152 -> 25152 bytes
 firmware/firmware.bin   | Bin 1830864 -> 1830864 bytes
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/src/version.cpp b/code/src/version.cpp
index 555083b11..d3d9b38c2 100644
--- a/code/src/version.cpp
+++ b/code/src/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="7bfdfd3";
+const char* GIT_REV="c292ecd";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2020-11-15 12:51";
\ No newline at end of file
+const char* BUILD_TIME="2020-11-15 18:27";
\ No newline at end of file
diff --git a/code/src/version.h b/code/src/version.h
index 6570e6f94..7d39a0343 100644
--- a/code/src/version.h
+++ b/code/src/version.h
@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v3.1.0 - 2020-10-26";
+const char* GIT_BASE_BRANCH = "master - v4.0.0 - 2020-11-15";
 
 
 const char* git_base_branch(void)
diff --git a/code/version.cpp b/code/version.cpp
index 555083b11..d3d9b38c2 100644
--- a/code/version.cpp
+++ b/code/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="7bfdfd3";
+const char* GIT_REV="c292ecd";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2020-11-15 12:51";
\ No newline at end of file
+const char* BUILD_TIME="2020-11-15 18:27";
\ No newline at end of file
diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin
index 2b714bcf680f5b040be54b5a362f1495830b7048..4f8ddc1d1e77baca6a9d0c974953130eb85a295c 100644
GIT binary patch
delta 60
zcmV-C0K@;l!~wv>0kHBC2RJ%1I65#jlK})6vk?;xPay-UnP~622%~z{9^y?ci@`=?
SAYo82=daMTm?KIaKk8$yIv3CY

delta 60
zcmV-C0K@;l!~wv>0kHBC2QoS}GCDIklK})6vk?;xPaz9tv%1vDN+vC<Q@u7N@R%+_
S>@~fu@pJ`<MDXWpQY$C0L>LhO

diff --git a/firmware/firmware.bin b/firmware/firmware.bin
index e91f25f2a12aec411fcbef94c0a1c45534a31195..6a932f2280f2e254b53afbb04fe47d93749d8802 100644
GIT binary patch
delta 248
zcmca`KmWr0{0W8Z7FI^)R)%I1D=ZXPE<Wm$tJ>AH>(2Dt33HxG{CK}h`!U}{(Q^|-
zzFxl7a((hgkATezjB=bpCVB>X1`4_gMg~R(x`u|jhNhbXxIEbSL548^L9&shQEGBZ
z^Kyaq<pPXA%ml>DK+FQftU$~L#Oy%K0mPg@%mu{UK+FTgyg<wc#QZ=E(k}?aLO?7G
z#3Dc}3dCYSEDppHKr9KwQrnjcNORm*jAh)l_@?QfPB!6+_RAX>Lj%6uE9^HGzj-s`
L;mjR1_Qy*B*nV6S

delta 248
zcmca`KmWr0{0W8ZMpmYVR;DHsD=ZWqYWE#d3ZL;&`;OA)JG;DIH_ZJX+OVf4Sn0vh
zBVRQ_&rJU45wKZ-QI1o{SkF+;KtWf*$iT=z*U&)M$ZT@}mj@d^$S?*VFi%QLNlP(q
zUM|qST!0aXnShuXh*^M`6^Pk@m>q~YfS41Axqz4(h<SjR7l`?Qm>-Bi`UQbl2#AG&
zSOkbgfmjTP#erA?h$VqoYWs2lX^#7fGZZhTDe)cL9{Wzr;#sc$3-035=G=n4tkyqy
L3>bfN?LG<sh8bC^