Explorar o código

Merge pull request #217 from jomjol/master

Synch rolling
jomjol %!s(int64=4) %!d(string=hai) anos
pai
achega
b34bd5d988
Modificáronse 4 ficheiros con 6 adicións e 6 borrados
  1. 3 3
      code/main/version.cpp
  2. 3 3
      code/version.cpp
  3. BIN=BIN
      firmware/bootloader.bin
  4. BIN=BIN
      firmware/firmware.bin

+ 3 - 3
code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="10d49b5";
+const char* GIT_REV="1e09bfb";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-05-08 18:03";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-05-08 18:20";

+ 3 - 3
code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="10d49b5";
+const char* GIT_REV="1e09bfb";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-05-08 18:03";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2021-05-08 18:20";

BIN=BIN
firmware/bootloader.bin


BIN=BIN
firmware/firmware.bin