Przeglądaj źródła

Rolling 20210101

jomjol 5 lat temu
rodzic
commit
8a06825871

+ 2 - 2
code/components/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -209,10 +209,10 @@ bool ClassFlowControll::doFlow(string time)
         zw_time = gettimestring("%Y%m%d-%H%M%S");
         zw_time = gettimestring("%Y%m%d-%H%M%S");
         aktstatus = zw_time + ": " + FlowControll[i]->name();
         aktstatus = zw_time + ": " + FlowControll[i]->name();
         
         
-#ifdef DEBUG_DETAIL_ON         
+// #ifdef DEBUG_DETAIL_ON         
         string zw = "FlowControll.doFlow - " + FlowControll[i]->name();
         string zw = "FlowControll.doFlow - " + FlowControll[i]->name();
         LogFile.WriteHeapInfo(zw);
         LogFile.WriteHeapInfo(zw);
-#endif
+// #endif
 
 
         if (!FlowControll[i]->doFlow(time)){
         if (!FlowControll[i]->doFlow(time)){
             repeat++;
             repeat++;

+ 3 - 3
code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="9c8f64f";
+const char* GIT_REV="ce2f1bc";
 const char* GIT_TAG="";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling-update-cimage";
-const char* BUILD_TIME="2021-01-01 09:32";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-01-01 10:44";

+ 3 - 3
code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="9c8f64f";
+const char* GIT_REV="ce2f1bc";
 const char* GIT_TAG="";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="rolling-update-cimage";
-const char* BUILD_TIME="2021-01-01 09:32";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-01-01 10:44";

BIN
firmware/bootloader.bin


BIN
firmware/firmware.bin