From a23d7ee6e270b7a097b3c11f529fa0d5c0386d48 Mon Sep 17 00:00:00 2001 From: jomjol <30766535+jomjol@users.noreply.github.com> Date: Mon, 26 Oct 2020 18:29:52 +0100 Subject: [PATCH] v3.1.0 --- 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 1792736 -> 1792736 bytes firmware/html.zip | Bin 66894 -> 66894 bytes 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/src/version.cpp b/code/src/version.cpp index a3d684c7..035b4534 100644 --- a/code/src/version.cpp +++ b/code/src/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="2614481"; +const char* GIT_REV="8f51895"; const char* GIT_TAG=""; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2020-10-14 18:40"; \ No newline at end of file +const char* BUILD_TIME="2020-10-26 18:26"; \ No newline at end of file diff --git a/code/src/version.h b/code/src/version.h index 1fbcc2b8..6570e6f9 100644 --- a/code/src/version.h +++ b/code/src/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -const char* GIT_BASE_BRANCH = "master - v3.0.0 - 2020-10-14"; +const char* GIT_BASE_BRANCH = "master - v3.1.0 - 2020-10-26"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index a3d684c7..035b4534 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="2614481"; +const char* GIT_REV="8f51895"; const char* GIT_TAG=""; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2020-10-14 18:40"; \ No newline at end of file +const char* BUILD_TIME="2020-10-26 18:26"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index d0f95cb6af0361d23700cf6a1bebec46c1396165..2acd1e811f1045a84ac9a5793ac682f33d9c9ee9 100644 GIT binary patch delta 58 zcmV-A0LA~n!~wv>0kHHE1u{1}Gcc0@1Q@ds6An)y3XIB4h>xN|r9}p9kkf)z0BO=8 Q0kHHE1vD`_GdGg~1Q@ds6An)y4T%#W1^Md6#eR%q7|LDEStC%^ QrNxrT_o{ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index a7c09acfc87c1314379b0b032fd4f55a239db6ab..7cd67d52aed6d336e33333f432d522d60fad0bff 100644 GIT binary patch delta 263 zcmaE`HTS{R+zG|PMrKwfMhsBkpIo9~WHzx)OW{W2QxGrHSQLoGfLI)eC4g8Gh^4ld3rKr-DPFQ#I=%K!+>O)^#~)4b*FMi^ Uu(UdJQMHN~qrm(${&m7h0Dz=Z9smFU delta 263 zcmaE`HTS{R+zG|PCI(i<1`JT(pIo9~Xfm-)OCj-5+r_jKj>@6)Kc%d{9hEj=*Nk!l zPld$4F+UIdT)jMJdgBqsfXxbw9Gn6MdIk!*3PuJ-2D*koWU|?UONUL^&_uz|!pa0} zw2_&iiHU__bGbl!xd0;&GXXI(5VHU=D-g2*F*^`*05K;Ja{)0o5c2>rFA(zqF+UK4 z^a}#95D*Iku?P^00O!>8Akyq3Qw9ANy@QF`~nn5{A= TU#w#;y1U6S^Usm+-UA5$j8Rte diff --git a/firmware/html.zip b/firmware/html.zip index 47bd7ab7b2c7b9abe60d74ffc272ff98d0771a09..34f45148f83435e92afd6612bc751f17a0465dc3 100644 GIT binary patch delta 769 zcmX@t#d5BTWrGJ3W5Z@orej<{N`SYX8%Rx%5Mp68-Mm=Fmzi&>qo9p(k{)_r)-$hdg(yiea*KsqPS_^t=E?fCaVR>p?Ol7HRhZhX$m zWLSNTk>R`D)nBdG7z4Z+nd})v7#J8h7?K($*Zp-tC{Zc6hDFJPzs?9HfeWvrD|ur& z+3_EeDR+XWh_sO z9brNO%wSa-%#1F04R2XIy^ERAO1&R3&9rNb4Bzdp{%XC(7~svwWX~YNz`(%4kkm1`?yrm7_V9d&5|x5$Sd={Y>nz8) zs}Q0jaN%`yC2wpeJN|Q#(~>QLD7h0nMWhYYqSH$zFaGDk)?8l(R5JPPKXIVrSpU1r zK?Hz~tGjdqVJsKWaSRNz)=tj)Z_oDTVFgIf`v2mL>n9)oZzm5CxW>5S%8}~oYE*lG zVL4TW(Nyi+{d2dbO}WN+=s_jKO+UG3okDX{QpePKMh|(ol1N4YbY}wtbm}uk6Sd-u zC1>h@VR-OexlTQhe$RFuY&>dMPIq8rbZ3iRRtL0ldM_g*(38`bGBP^K9pGq$xB|tO zkSMsdayknWqYE2E&2&E|u(mWNMpw2sS