diff --git a/components/TFT_eSPI b/components/TFT_eSPI index 800da93..dad692d 160000 --- a/components/TFT_eSPI +++ b/components/TFT_eSPI @@ -1 +1 @@ -Subproject commit 800da9381f1659d39b0b61ce681c0a42d852889e +Subproject commit dad692dfce5b97c352e0e9a4b072d1e29a4bd0de diff --git a/components/asio_web b/components/asio_web index f12c21b..086f88c 160000 --- a/components/asio_web +++ b/components/asio_web @@ -1 +1 @@ -Subproject commit f12c21b41bfc70976241b1d79be3c1005137f3ce +Subproject commit 086f88c70a6cc2ea5578bbfbadfe11fe1ea6e5bc diff --git a/components/cpputils b/components/cpputils index 2a957fb..b8e9f6f 160000 --- a/components/cpputils +++ b/components/cpputils @@ -1 +1 @@ -Subproject commit 2a957fb6276258f2958f944e3af1d9e7a1aab231 +Subproject commit b8e9f6f48210a7f68fd602e361b56c6235fd4425 diff --git a/components/esp-gui-lib b/components/esp-gui-lib index a75c419..3a7b567 160000 --- a/components/esp-gui-lib +++ b/components/esp-gui-lib @@ -1 +1 @@ -Subproject commit a75c419742047b0ece9565e93746baff5163b944 +Subproject commit 3a7b567eaabf12c735c974e40d8eef156ffe228a diff --git a/components/espcpputils b/components/espcpputils index d811b9e..35e3a49 160000 --- a/components/espcpputils +++ b/components/espcpputils @@ -1 +1 @@ -Subproject commit d811b9e4701bc42554f46e8bd8f1ed95fcfa184c +Subproject commit 35e3a49a33e94df5d13ca83c1cf414e697d6d4e2 diff --git a/components/espwifistack b/components/espwifistack index 724cac1..2d222b6 160000 --- a/components/espwifistack +++ b/components/espwifistack @@ -1 +1 @@ -Subproject commit 724cac190f88b0b5c5fc02d75df17fa782fcdfb7 +Subproject commit 2d222b6bb053273c7a6bb3555eaeb66680b65ef3 diff --git a/main/can.cpp b/main/can.cpp index b86e148..bd1c86e 100644 --- a/main/can.cpp +++ b/main/can.cpp @@ -296,7 +296,8 @@ void sendCanCommands() const auto status = twai_get_status_info(&status_info); const auto timestamp_after = espchrono::millis_clock::now(); - if ((result == ESP_ERR_TIMEOUT || status_info.state == TWAI_STATE_BUS_OFF) || (status == ESP_OK && status_info.bus_error_count > can_sequential_bus_errors)) + if ((result == ESP_ERR_TIMEOUT || status_info.state == TWAI_STATE_BUS_OFF) || + (status == ESP_OK && status_info.bus_error_count > can_sequential_bus_errors)) { ++can_sequential_error_cnt; ++can_total_error_cnt; diff --git a/main/displays/menus/featureflagsmenu.cpp b/main/displays/menus/featureflagsmenu.cpp index 75884c6..20cef1e 100644 --- a/main/displays/menus/featureflagsmenu.cpp +++ b/main/displays/menus/featureflagsmenu.cpp @@ -49,9 +49,8 @@ public: { std::string_view name = m_flag.isEnabled.nvsName(); constexpr const std::string_view prefix = "f_"; - if (cpputils::stringStartsWith(name, prefix)) { + if (name.ends_with(prefix)) name.remove_prefix(prefix.size()); - } std::string return_name = std::string{name}; return_name += m_flag.isBeta() ? " (beta)" : ""; return return_name; diff --git a/main/webserver_ota.cpp b/main/webserver_ota.cpp index d40deb9..67d3843 100644 --- a/main/webserver_ota.cpp +++ b/main/webserver_ota.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include // local includes #include "ota.h" @@ -109,7 +109,7 @@ esp_err_t webserver_ota_handler(httpd_req_t *req) body += fmt::format("\"cur_secver\":\"{}\",", app_desc->secure_version); body += fmt::format("\"cur_ts\":\"{}\",", app_desc->time); body += fmt::format("\"cur_idf\":\"{}\",", app_desc->idf_ver); - body += fmt::format("\"cur_sha\":\"{}\",", espcpputils::toHexString({app_desc->app_elf_sha256, 8})); + body += fmt::format("\"cur_sha\":\"{}\",", cpputils::toHexString({app_desc->app_elf_sha256, 8})); } else { @@ -135,7 +135,7 @@ esp_err_t webserver_ota_handler(httpd_req_t *req) body += fmt::format("\"new_secver\":\"{}\",", appDesc->secure_version); body += fmt::format("\"new_ts\":\"{}\",", appDesc->time); body += fmt::format("\"new_idf\":\"{}\",", appDesc->idf_ver); - body += fmt::format("\"new_sha\":\"{}\",", espcpputils::toHexString({appDesc->app_elf_sha256, 8})); + body += fmt::format("\"new_sha\":\"{}\",", cpputils::toHexString({appDesc->app_elf_sha256, 8})); } else @@ -231,7 +231,7 @@ esp_err_t webserver_ota_handler(httpd_req_t *req) { HtmlTag trTag{"tr", body}; { HtmlTag tdTag{"td", body}; body += "Current sha256"; } - { HtmlTag tdTag{"td", body}; body += esphttpdutils::htmlentities(espcpputils::toHexString({app_desc->app_elf_sha256, 8})); } + { HtmlTag tdTag{"td", body}; body += esphttpdutils::htmlentities(cpputils::toHexString({app_desc->app_elf_sha256, 8})); } } } else @@ -307,7 +307,7 @@ esp_err_t webserver_ota_handler(httpd_req_t *req) { HtmlTag trTag{"tr", body}; { HtmlTag tdTag{"td", body}; body += "New sha256"; } - { HtmlTag tdTag{"td", body}; body += esphttpdutils::htmlentities(espcpputils::toHexString({appDesc->app_elf_sha256, 8})); } + { HtmlTag tdTag{"td", body}; body += esphttpdutils::htmlentities(cpputils::toHexString({appDesc->app_elf_sha256, 8})); } } } } diff --git a/open_ide.sh b/open_ide.sh index f1940c5..69920d1 100755 --- a/open_ide.sh +++ b/open_ide.sh @@ -5,4 +5,4 @@ then source export.sh --skip-source-check fi -qtcreator "bobbycar-boardcomputer-firmware" 2>&1 >/dev/null & +QTC_CLANG_CMD_OPTIONS_BLACKLIST=-mlongcalls\;-std=gnu++23 qtcreator "bobbycar-boardcomputer-firmware" 2>&1 >/dev/null & diff --git a/sdkconfig_feedc0de_new b/sdkconfig_feedc0de_new index 02bfcf3..873e732 100644 --- a/sdkconfig_feedc0de_new +++ b/sdkconfig_feedc0de_new @@ -428,7 +428,9 @@ CONFIG_APPTRACE_LOCK_ENABLE=y # # ESP-ASIO # -# CONFIG_ASIO_SSL_SUPPORT is not set +CONFIG_ASIO_SSL_SUPPORT=y +CONFIG_ASIO_USE_ESP_OPENSSL=y +CONFIG_ASIO_SSL_BIO_SIZE=1024 # end of ESP-ASIO # @@ -1638,10 +1640,10 @@ CONFIG_TFT_ST7789_DRIVER=y # CONFIG_TFT_GC9A01_DRIVER is not set CONFIG_TFT_RGB_ORDER=y # CONFIG_TFT_BGR_ORDER is not set -CONFIG_TFT_WIDTH=128 -CONFIG_TFT_HEIGHT=240 -CONFIG_TFT_INVERSION_DISABLE=y -# CONFIG_TFT_INVERSION_ON is not set +CONFIG_TFT_WIDTH=240 +CONFIG_TFT_HEIGHT=320 +# CONFIG_TFT_INVERSION_DISABLE is not set +CONFIG_TFT_INVERSION_ON=y # CONFIG_TFT_INVERSION_OFF is not set # CONFIG_TFT_PARALLEL_8_BIT is not set @@ -1675,7 +1677,7 @@ CONFIG_TFT_LOAD_FONT4=y CONFIG_TFT_LOAD_FONT7=y # CONFIG_TFT_LOAD_FONT8 is not set # CONFIG_TFT_LOAD_GFXFF is not set -# CONFIG_TFT_SMOOTH_FONT is not set +CONFIG_TFT_SMOOTH_FONT=y # end of Fonts #