소스 검색

Merge pull request #32 from jomjol/master

Update Rolling
jomjol 5 년 전
부모
커밋
aab8dfcde5
5개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      code/lib/connect_wlan/connect_wlan.cpp
  2. 3 3
      code/src/version.cpp
  3. 3 3
      code/version.cpp
  4. BIN
      firmware/bootloader.bin
  5. BIN
      firmware/firmware.bin

+ 1 - 1
code/lib/connect_wlan/connect_wlan.cpp

@@ -187,7 +187,7 @@ void LoadWlanFromFile(std::string fn, std::string &_ssid, std::string &_passphra
     // Check if Hostname was empty in .ini if yes set to std_hostname
     // Check if Hostname was empty in .ini if yes set to std_hostname
     if(_hostname.length() <= 0){
     if(_hostname.length() <= 0){
         _hostname = std_hostname;
         _hostname = std_hostname;
-        }
+    }
 }
 }
 
 
 
 

+ 3 - 3
code/src/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="cefe125";
+const char* GIT_REV="bafd67b";
 const char* GIT_TAG="";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-09-28 19:32";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2020-09-28 19:57";

+ 3 - 3
code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="cefe125";
+const char* GIT_REV="bafd67b";
 const char* GIT_TAG="";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2020-09-28 19:32";
+const char* GIT_BRANCH="master";
+const char* BUILD_TIME="2020-09-28 19:57";

BIN
firmware/bootloader.bin


BIN
firmware/firmware.bin