diff --git a/code/components/jomjol_flowcontroll/ClassFlow.cpp b/code/components/jomjol_flowcontroll/ClassFlow.cpp index 97d77dfb..ab03d72c 100644 --- a/code/components/jomjol_flowcontroll/ClassFlow.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlow.cpp @@ -130,13 +130,12 @@ 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 { - fgets(zw, 1024, pfile); - printf("%s", zw); - if (feof(pfile)) + if (!fgets(zw, 1024, pfile)) { *rt = ""; return false; } + printf("%s", zw); *rt = zw; *rt = trim(*rt); } diff --git a/code/main/version.cpp b/code/main/version.cpp index 4e3b07c4..76ed6f94 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="08b0b25"; +const char* GIT_REV="d7bb147"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-07-08 21:42"; \ No newline at end of file +const char* BUILD_TIME="2021-07-11 17:52"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index 4e3b07c4..76ed6f94 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="08b0b25"; +const char* GIT_REV="d7bb147"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-07-08 21:42"; \ No newline at end of file +const char* BUILD_TIME="2021-07-11 17:52"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index c6963e7a..7e505c2e 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 38df11d0..2f82d251 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ