diff --git a/README.md b/README.md index 38090e0e..04eb4464 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,9 @@ In other cases you can contact the developer via email: user_ctx)->base_path); printf("Directory: %s, start_fn: %d, found: %d\n", directory.c_str(), start_fn, found); directory = directory.substr(start_fn, found - start_fn + 1); - printf("Directory danach: %s\n", directory.c_str()); + printf("Directory danach 3: %s\n", directory.c_str()); directory = "/fileserver" + directory; - printf("Directory danach: %s\n", directory.c_str()); + printf("Directory danach 4: %s\n", directory.c_str()); } diff --git a/code/main/version.cpp b/code/main/version.cpp index d588f9b6..69ba09b6 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="9ae8d0a"; +const char* GIT_REV="104b725"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-07-23 20:49"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-07-25 18:05"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index 04ef1f0f..53838ab2 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.2 - 2021-07-23"; +const char* GIT_BASE_BRANCH = "master - v8.0.3 - 2021-07-25"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index d588f9b6..69ba09b6 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="9ae8d0a"; +const char* GIT_REV="104b725"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-07-23 20:49"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-07-25 18:05"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 0fd39994..623707d1 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 7019547b..2154765f 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index d8e49f82..3b7f9a0e 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html index 69da9d31..8b03381d 100644 --- a/sd-card/html/edit_config_param.html +++ b/sd-card/html/edit_config_param.html @@ -367,9 +367,6 @@ textarea { - - ExtendedResolution - ModelInputSize diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt index 9c50fbf5..99affd46 100644 --- a/sd-card/html/version.txt +++ b/sd-card/html/version.txt @@ -1 +1 @@ -9.5.1 +9.5.2 \ No newline at end of file