diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp index 0402fa26..9fb50a76 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp @@ -209,10 +209,10 @@ bool ClassFlowControll::doFlow(string time) zw_time = gettimestring("%Y%m%d-%H%M%S"); aktstatus = zw_time + ": " + FlowControll[i]->name(); -#ifdef DEBUG_DETAIL_ON +// #ifdef DEBUG_DETAIL_ON string zw = "FlowControll.doFlow - " + FlowControll[i]->name(); LogFile.WriteHeapInfo(zw); -#endif +// #endif if (!FlowControll[i]->doFlow(time)){ repeat++; diff --git a/code/main/version.cpp b/code/main/version.cpp index 16d381a8..49987ab5 100644 --- a/code/main/version.cpp +++ b/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_BRANCH="rolling-update-cimage"; -const char* BUILD_TIME="2021-01-01 09:32"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-01-01 10:44"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index 16d381a8..49987ab5 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="9c8f64f"; +const char* GIT_REV="ce2f1bc"; const char* GIT_TAG=""; -const char* GIT_BRANCH="rolling-update-cimage"; -const char* BUILD_TIME="2021-01-01 09:32"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-01-01 10:44"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 078426e6..b310c3bd 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index d7a46520..9ae2c89c 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ