diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d5880a..d1270d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,9 +22,11 @@ include(config.cmake) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) +add_definitions(-DASIO_DISABLE_CONCEPTS=1) + set(EXTRA_COMPONENT_DIRS esp-protocols/components ) diff --git a/components/arduino-esp32 b/components/arduino-esp32 index 2b2f7cd..a3d5e78 160000 --- a/components/arduino-esp32 +++ b/components/arduino-esp32 @@ -1 +1 @@ -Subproject commit 2b2f7cd93668bfcf7618216551cc14c3914b27c9 +Subproject commit a3d5e78b8379805562b737fc3868f45da202ada6 diff --git a/components/esp-gui-lib b/components/esp-gui-lib index 15bdca5..a75c419 160000 --- a/components/esp-gui-lib +++ b/components/esp-gui-lib @@ -1 +1 @@ -Subproject commit 15bdca56459fe05ab405a364d8f0a33f22387694 +Subproject commit a75c419742047b0ece9565e93746baff5163b944 diff --git a/components/espconfiglib b/components/espconfiglib index 3ca0eb0..c12f6fa 160000 --- a/components/espconfiglib +++ b/components/espconfiglib @@ -1 +1 @@ -Subproject commit 3ca0eb09d6e5041bcb85ee0d01fc38de6f5438dc +Subproject commit c12f6fa3a8f2be4c2fcdd09ea5d515386cbf25ec diff --git a/components/espcpputils b/components/espcpputils index a155041..d811b9e 160000 --- a/components/espcpputils +++ b/components/espcpputils @@ -1 +1 @@ -Subproject commit a155041878e2c78dfa94fa774f15611248bd9349 +Subproject commit d811b9e4701bc42554f46e8bd8f1ed95fcfa184c diff --git a/components/esphttpdutils b/components/esphttpdutils index c095443..eb152b8 160000 --- a/components/esphttpdutils +++ b/components/esphttpdutils @@ -1 +1 @@ -Subproject commit c095443979088f0ac49adab804bfaf7979960c25 +Subproject commit eb152b84064d6187c89e71cac5679e3229d9a38a diff --git a/components/espwifistack b/components/espwifistack index 4749a9d..724cac1 160000 --- a/components/espwifistack +++ b/components/espwifistack @@ -1 +1 @@ -Subproject commit 4749a9db5c5a542918ab3dd8dd7d9fd0539f6222 +Subproject commit 724cac190f88b0b5c5fc02d75df17fa782fcdfb7 diff --git a/components/fmt b/components/fmt index 7b25dd1..32e1617 160000 --- a/components/fmt +++ b/components/fmt @@ -1 +1 @@ -Subproject commit 7b25dd172b1b8d851db25436902c76deab098445 +Subproject commit 32e16173ce4c56151a8300b39d66301c99e4d94f diff --git a/esp-idf b/esp-idf index d002694..468b1f1 160000 --- a/esp-idf +++ b/esp-idf @@ -1 +1 @@ -Subproject commit d0026946cd9a46f08cd3de69ecc88381d0c59f45 +Subproject commit 468b1f17c95f4e758abeedb96a25d7040f7796cb diff --git a/main/ble_bobby.cpp b/main/ble_bobby.cpp index dc9c8b9..adfe5e9 100644 --- a/main/ble_bobby.cpp +++ b/main/ble_bobby.cpp @@ -6,7 +6,6 @@ // 3rdparty lib includes #include #include -#include // local includes #include "ledstrip.h" diff --git a/main/buildserver.cpp b/main/buildserver.cpp index e1595d9..f794f37 100644 --- a/main/buildserver.cpp +++ b/main/buildserver.cpp @@ -155,7 +155,7 @@ namespace buildserver { std::string get_hash_url(std::string hash) { - return fmt::format(url_for_hashes, hash); + return fmt::format(fmt::runtime(url_for_hashes), hash); } std::string get_latest_url() diff --git a/main/can.cpp b/main/can.cpp index 78d7845..94c2799 100644 --- a/main/can.cpp +++ b/main/can.cpp @@ -4,6 +4,7 @@ // system includes #include #include +#include // esp-idf #include @@ -14,7 +15,6 @@ #include #include #include -#include // local includes #include "bobbycar-can.h" diff --git a/main/changevaluedisplay_bobbyquickactions.cpp b/main/changevaluedisplay_bobbyquickactions.cpp index e164f3b..c85d9a0 100644 --- a/main/changevaluedisplay_bobbyquickactions.cpp +++ b/main/changevaluedisplay_bobbyquickactions.cpp @@ -1,5 +1,8 @@ #include "changevaluedisplay_bobbyquickactions.h" +// system includes +#include + // esp-idf includes #include @@ -7,7 +10,6 @@ #include #include #include -#include // local includes #include "utils.h" diff --git a/main/changevaluedisplay_controlmode.cpp b/main/changevaluedisplay_controlmode.cpp index d2fb5c1..12ee662 100644 --- a/main/changevaluedisplay_controlmode.cpp +++ b/main/changevaluedisplay_controlmode.cpp @@ -1,5 +1,8 @@ #include "changevaluedisplay_controlmode.h" +// system includes +#include + // esp-idf includes #include @@ -7,7 +10,6 @@ #include #include #include -#include // local includes #include "utils.h" diff --git a/main/changevaluedisplay_controltype.cpp b/main/changevaluedisplay_controltype.cpp index 7363120..c23e134 100644 --- a/main/changevaluedisplay_controltype.cpp +++ b/main/changevaluedisplay_controltype.cpp @@ -1,5 +1,8 @@ #include "changevaluedisplay_controltype.h" +// system includes +#include + // esp-idf includes #include @@ -7,7 +10,6 @@ #include #include #include -#include // local includes #include "utils.h" diff --git a/main/changevaluedisplay_handbremsmode.cpp b/main/changevaluedisplay_handbremsmode.cpp index e5574d8..a11e444 100644 --- a/main/changevaluedisplay_handbremsmode.cpp +++ b/main/changevaluedisplay_handbremsmode.cpp @@ -1,5 +1,8 @@ #include "changevaluedisplay_handbremsmode.h" +// system includes +#include + // esp-idf includes #include @@ -7,7 +10,6 @@ #include #include #include -#include // local includes #include "utils.h" diff --git a/main/changevaluedisplay_larsmmode_mode.cpp b/main/changevaluedisplay_larsmmode_mode.cpp index 20469ae..274ebc7 100644 --- a/main/changevaluedisplay_larsmmode_mode.cpp +++ b/main/changevaluedisplay_larsmmode_mode.cpp @@ -1,5 +1,8 @@ #include "changevaluedisplay_larsmmode_mode.h" +// system includes +#include + // esp-idf includes #include @@ -7,7 +10,6 @@ #include #include #include -#include // local includes #include "utils.h" diff --git a/main/changevaluedisplay_unifiedmodelmode.cpp b/main/changevaluedisplay_unifiedmodelmode.cpp index 0aa7e43..c33a2c5 100644 --- a/main/changevaluedisplay_unifiedmodelmode.cpp +++ b/main/changevaluedisplay_unifiedmodelmode.cpp @@ -1,5 +1,8 @@ #include "changevaluedisplay_unifiedmodelmode.h" +// system includes +#include + // esp-idf includes #include @@ -7,7 +10,6 @@ #include #include #include -#include // local includes #include "utils.h" diff --git a/main/displays/menus/candebugmenu.cpp b/main/displays/menus/candebugmenu.cpp index a67726e..de66de0 100644 --- a/main/displays/menus/candebugmenu.cpp +++ b/main/displays/menus/candebugmenu.cpp @@ -2,6 +2,9 @@ #include "candebugmenu.h" +// system includes +#include + // esp-idf includes #include @@ -14,7 +17,6 @@ #include #include #include -#include // local includes #include "bobbyerrorhandler.h" diff --git a/main/displays/menus/selectotabuildmenu.cpp b/main/displays/menus/selectotabuildmenu.cpp index c8e558d..e940724 100644 --- a/main/displays/menus/selectotabuildmenu.cpp +++ b/main/displays/menus/selectotabuildmenu.cpp @@ -137,7 +137,7 @@ void SelectBuildMenu::buildMenuFromJson() { auto &menuitem = constructMenuItem>(); menuitem.setHash(hash); - menuitem.setUrl(fmt::format(url_for_hashes, hash)); + menuitem.setUrl(fmt::format(fmt::runtime(url_for_hashes), hash)); } constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } diff --git a/main/displays/speedinfodisplay.cpp b/main/displays/speedinfodisplay.cpp index 45d33d9..7b0c71a 100644 --- a/main/displays/speedinfodisplay.cpp +++ b/main/displays/speedinfodisplay.cpp @@ -36,10 +36,9 @@ void SpeedInfoDisplay::redraw() tft.setTextSize(4); - m_labelSpeed.redraw(fmt::format( - std::abs(avgSpeedKmh) < 10 ? "{:.2f}" : - (std::abs(avgSpeedKmh) < 100 ? "{:.1f}" : "{:.0f}"), - avgSpeedKmh)); + m_labelSpeed.redraw( + std::abs(avgSpeedKmh) < 10 ? fmt::format("{:.2f}", avgSpeedKmh) : + (std::abs(avgSpeedKmh) < 100 ? fmt::format("{:.1f}", avgSpeedKmh) : fmt::format("{:.0f}", avgSpeedKmh))); tft.setTextSize(1); m_batteryPercentLabel.redraw(getBatteryPercentageString()); @@ -58,12 +57,9 @@ void SpeedInfoDisplay::redraw() m_currentConsumptionLabel.redraw("No comsumption"); } - m_distanceLabel.redraw(fmt::format( - drivingStatistics.meters_driven > 1000 ? "{:.3f} km" : - (drivingStatistics.meters_driven > 100 ? "{:.1f} m" : "{:.2f} m"), - drivingStatistics.meters_driven > 1000 ? - drivingStatistics.meters_driven / 1000 : - drivingStatistics.meters_driven)); + m_distanceLabel.redraw( + drivingStatistics.meters_driven > 1000 ? fmt::format("{:.3f} km", drivingStatistics.meters_driven / 1000) : + (drivingStatistics.meters_driven > 100 ? fmt::format("{:.1f} m", drivingStatistics.meters_driven) : fmt::format("{:.2f} m", drivingStatistics.meters_driven))); tft.setTextSize(1); diff --git a/main/settingspersister.cpp b/main/settingspersister.cpp index f2ab9f1..59e6628 100644 --- a/main/settingspersister.cpp +++ b/main/settingspersister.cpp @@ -13,7 +13,6 @@ #include #include #include -#include // local includes #include "profilesettings.h" diff --git a/main/udpcloud.cpp b/main/udpcloud.cpp index 799178f..b7cf492 100644 --- a/main/udpcloud.cpp +++ b/main/udpcloud.cpp @@ -203,7 +203,7 @@ std::string buildUdpCloudString() const auto addController = [&](const Controller &controller, const bool isBack) { if (controller.feedbackValid) { - buf += fmt::format("\"{}\":{", !isBack ? "f":"b"); + buf += fmt::format("\"{}\":{{", !isBack ? "f":"b"); // Voltage if (controller.getCalibratedVoltage()) buf += fmt::format("\"V\":{},", controller.getCalibratedVoltage()); diff --git a/main/utils.cpp b/main/utils.cpp index 221c149..1f83cab 100644 --- a/main/utils.cpp +++ b/main/utils.cpp @@ -1,5 +1,8 @@ #include "utils.h" +// system includes +#include + // local includes #include "globals.h" #include "newsettings.h" diff --git a/main/utils.h b/main/utils.h index 4811a0b..93194c2 100644 --- a/main/utils.h +++ b/main/utils.h @@ -12,7 +12,6 @@ // 3rdparty lib includes #include -#include #include // local includes diff --git a/main/webserver_displaycontrol.cpp b/main/webserver_displaycontrol.cpp index 89ec8bf..6b09e33 100644 --- a/main/webserver_displaycontrol.cpp +++ b/main/webserver_displaycontrol.cpp @@ -1,5 +1,8 @@ #include "webserver_displaycontrol.h" +// system includes +#include + // esp-idf includes #include #include @@ -17,7 +20,6 @@ #include #include #include -#include // local includes #include "bobbybuttons.h" diff --git a/main/webserver_newsettings.cpp b/main/webserver_newsettings.cpp index 5c16399..691374b 100644 --- a/main/webserver_newsettings.cpp +++ b/main/webserver_newsettings.cpp @@ -2,6 +2,7 @@ // system includes #include +#include // esp-idf includes #include @@ -15,7 +16,6 @@ #include #include #include -#include #include // local includes