diff --git a/README.md b/README.md index 04eb4464..dacc4e73 100644 --- a/README.md +++ b/README.md @@ -47,11 +47,12 @@ In other cases you can contact the developer via email: ::iterator it = gpioMap->begin(); it != gpioMap->end(); ++it) { it->second->init(); } diff --git a/code/components/jomjol_flowcontroll/ClassFlow.cpp b/code/components/jomjol_flowcontroll/ClassFlow.cpp index ab03d72c..ff14c1b2 100644 --- a/code/components/jomjol_flowcontroll/ClassFlow.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlow.cpp @@ -130,11 +130,9 @@ bool ClassFlow::getNextLine(FILE* pfile, string *rt) *rt = trim(*rt); while ((zw[0] == ';' || zw[0] == '#' || (rt->size() == 0)) && !(zw[1] == '[')) // Kommentarzeilen (; oder #) und Leerzeilen überspringen, es sei denn es ist ein neuer auskommentierter Paragraph { + *rt = ""; if (!fgets(zw, 1024, pfile)) - { - *rt = ""; return false; - } printf("%s", zw); *rt = zw; *rt = trim(*rt); diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp index 7cc091e1..5540863a 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp @@ -173,9 +173,12 @@ void ClassFlowControll::InitFlow(std::string config) } else { - fgets(zw, 1024, pFile); - printf("%s", zw); - line = std::string(zw); + line = ""; + if (fgets(zw, 1024, pFile) && !feof(pFile)) + { + printf("Read: %s", zw); + line = std::string(zw); + } } } diff --git a/code/main/version.cpp b/code/main/version.cpp index d1907416..b17c541d 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="ea72256"; -const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-07-25 18:09"; \ No newline at end of file +const char* GIT_REV="fa3842b"; +const char* GIT_TAG="v8.0.3"; +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-07-29 20:11"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index 53838ab2..1d33ff78 100644 --- a/code/main/version.h +++ b/code/main/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -const char* GIT_BASE_BRANCH = "master - v8.0.3 - 2021-07-25"; +const char* GIT_BASE_BRANCH = "master - v8.0.4 - 2021-07-29"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index d1907416..b17c541d 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="ea72256"; -const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-07-25 18:09"; \ No newline at end of file +const char* GIT_REV="fa3842b"; +const char* GIT_TAG="v8.0.3"; +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-07-29 20:11"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 67ad3f38..db7a26e6 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index cef63439..a0ef5733 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/sd-card/config/dig1110s1q.tflite b/sd-card/config/dig1110s1q.tflite new file mode 100644 index 00000000..d125cdf4 Binary files /dev/null and b/sd-card/config/dig1110s1q.tflite differ