Browse Source

Merge pull request #66 from jomjol/master

Rolling to v4.1.0
jomjol 5 years ago
parent
commit
ed3226e3a0
6 changed files with 7 additions and 7 deletions
  1. 3 3
      code/src/version.cpp
  2. 1 1
      code/src/version.h
  3. 3 3
      code/version.cpp
  4. BIN
      firmware/bootloader.bin
  5. BIN
      firmware/firmware.bin
  6. BIN
      firmware/html.zip

+ 3 - 3
code/src/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="1b5f6b4";
+const char* GIT_REV="2753552";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-11-30 12:06";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2020-11-30 22:02";

+ 1 - 1
code/src/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v4.0.0 - 2020-11-15";
+const char* GIT_BASE_BRANCH = "master - v4.1.0 - 2020-11-30";
 
 
 const char* git_base_branch(void)

+ 3 - 3
code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="1b5f6b4";
+const char* GIT_REV="2753552";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-11-30 12:06";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2020-11-30 22:02";

BIN
firmware/bootloader.bin


BIN
firmware/firmware.bin


BIN
firmware/html.zip