diff --git a/README.md b/README.md index bfb2c53e..167a1b43 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,11 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571 -##### Rolling - (2020-09-28) +##### Rolling - (2020-09-29) + +* Implementation of HTML-Version (thanks to phlupp) + +* ESP32 Temperature is now written correctly to log file * based on v2.2.1 (2020-09-28) diff --git a/code/src/server_tflite.cpp b/code/src/server_tflite.cpp index 77c99aaf..f5e2d5e0 100644 --- a/code/src/server_tflite.cpp +++ b/code/src/server_tflite.cpp @@ -438,7 +438,10 @@ void task_autodoFlow(void *pvParameter) LogFile.WriteToFile("task_autodoFlow - round done"); //CPU Temp float cputmp = temperatureRead(); -// LogFile.WriteToFile("CPU Temperature: %.2f", cputmp); + std::stringstream stream; + stream << std::fixed << std::setprecision(1) << cputmp; + string zwtemp = "CPU Temperature: " + stream.str(); + LogFile.WriteToFile(zwtemp); printf("CPU Temperature: %.2f\n", cputmp); fr_delta_ms = (esp_timer_get_time() - fr_start) / 1000; const TickType_t xDelay = (auto_intervall - fr_delta_ms) / portTICK_PERIOD_MS; diff --git a/code/src/version.cpp b/code/src/version.cpp index 79a4a0de..dacdffa1 100644 --- a/code/src/version.cpp +++ b/code/src/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="5d2e22c+"; +const char* GIT_REV="6e26fa6"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-09-29 02:43"; \ No newline at end of file +const char* BUILD_TIME="2020-09-29 18:38"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index 79a4a0de..dacdffa1 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="5d2e22c+"; +const char* GIT_REV="6e26fa6"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2020-09-29 02:43"; \ No newline at end of file +const char* BUILD_TIME="2020-09-29 18:38"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index c8d06c6c..b9d64e7e 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 01729233..9befbf9a 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index 97217dcd..47bd7ab7 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/html/.DS_Store b/sd-card/html/.DS_Store deleted file mode 100644 index 3b3240ee..00000000 Binary files a/sd-card/html/.DS_Store and /dev/null differ