jomjol 5 лет назад
Родитель
Сommit
e5206091dd
7 измененных файлов с 8 добавлено и 8 удалено
  1. 3 3
      code/main/version.cpp
  2. 1 1
      code/main/version.h
  3. 3 3
      code/version.cpp
  4. BIN
      firmware/bootloader.bin
  5. BIN
      firmware/firmware.bin
  6. BIN
      firmware/html.zip
  7. 1 1
      sd-card/html/version.txt

+ 3 - 3
code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="0e36010";
+const char* GIT_REV="e53c6fe";
 const char* GIT_TAG="";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling-speed-up-alignment";
-const char* BUILD_TIME="2021-01-04 12:13";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-01-05 08:24";

+ 1 - 1
code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include "Helper.h"
 #include <fstream>
 #include <fstream>
 
 
-const char* GIT_BASE_BRANCH = "master - v5.0.0 - 2020-12-06";
+const char* GIT_BASE_BRANCH = "master - v6.0.0 - 2020-01-02";
 
 
 
 
 const char* git_base_branch(void)
 const char* git_base_branch(void)

+ 3 - 3
code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="0e36010";
+const char* GIT_REV="e53c6fe";
 const char* GIT_TAG="";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling-speed-up-alignment";
-const char* BUILD_TIME="2021-01-02 09:02";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-01-05 08:24";

BIN
firmware/bootloader.bin


BIN
firmware/firmware.bin


BIN
firmware/html.zip


+ 1 - 1
sd-card/html/version.txt

@@ -1 +1 @@
-5.0.0
+5.0.1