diff --git a/.gitmodules b/.gitmodules index 3f7be29..6630b4c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "components/esp-gui-lib"] path = components/esp-gui-lib url = ../../0xFEEDC0DE64/esp-gui-lib.git +[submodule "components/espconfiglib"] + path = components/espconfiglib + url = ../../0xFEEDC0DE64/espconfiglib.git diff --git a/components/esp-gui-lib b/components/esp-gui-lib index 1bf5aec..aad3fce 160000 --- a/components/esp-gui-lib +++ b/components/esp-gui-lib @@ -1 +1 @@ -Subproject commit 1bf5aec0fd7c7d9cbe263311cc89096d69c9dd13 +Subproject commit aad3fcedcbe6bbc591021c79ba92d332f09bcc7f diff --git a/components/espconfiglib b/components/espconfiglib new file mode 160000 index 0000000..6c79bf7 --- /dev/null +++ b/components/espconfiglib @@ -0,0 +1 @@ +Subproject commit 6c79bf7feef9f3d809c56fd78ee69a6614ff5b14 diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 4a5f472..f6e5611 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -30,6 +30,7 @@ set(headers globals.h ledstripdefines.h ledstrip.h + newsettings.h macros_bobbycar.h modeinterface.h ota.h @@ -59,6 +60,7 @@ set(headers accessors/globalaccessors.h accessors/settingsaccessors.h accessors/wifiaccessors.h + actions/assertaction.h actions/bluetoothbeginaction.h actions/bluetoothbeginmasteraction.h actions/bluetoothconnectbmsaction.h @@ -69,6 +71,7 @@ set(headers actions/bmsturnoffdischargeaction.h actions/bmsturnonchargeaction.h actions/bmsturnondischargeaction.h + actions/dividebyzeroaction.h actions/erasenvsaction.h actions/ledstripanimationactions.h actions/ledstripblinkactions.h @@ -91,6 +94,7 @@ set(headers displays/gametrakcalibratedisplay.h displays/garagedisplay.h displays/graphdisplay.h + displays/ledstripcolorsdisplay.h displays/lockscreen.h displays/menus/aboutmenu.h displays/menus/accesspointwifisettingsmenu.h @@ -116,7 +120,6 @@ set(headers displays/menus/invertmenu.h displays/menus/larsmmodesettingsmenu.h displays/menus/ledstripmenu.h - displays/menus/ledstripcolorsmenu.h displays/menus/ledstripselectanimationmenu.h displays/menus/ledstripselectblinkmenu.h displays/menus/limitssettingsmenu.h @@ -211,6 +214,7 @@ set(sources globals.cpp ledstrip.cpp ledstripdefines.cpp + newsettings.cpp macros_bobbycar.cpp main.cpp modeinterface.cpp @@ -241,6 +245,7 @@ set(sources accessors/globalaccessors.cpp accessors/settingsaccessors.cpp accessors/wifiaccessors.cpp + actions/assertaction.cpp actions/bluetoothbeginaction.cpp actions/bluetoothbeginmasteraction.cpp actions/bluetoothconnectbmsaction.cpp @@ -251,6 +256,7 @@ set(sources actions/bmsturnoffdischargeaction.cpp actions/bmsturnonchargeaction.cpp actions/bmsturnondischargeaction.cpp + actions/dividebyzeroaction.cpp actions/erasenvsaction.cpp actions/ledstripanimationactions.cpp actions/ledstripblinkactions.cpp @@ -273,6 +279,7 @@ set(sources displays/gametrakcalibratedisplay.cpp displays/garagedisplay.cpp displays/graphdisplay.cpp + displays/ledstripcolorsdisplay.cpp displays/lockscreen.cpp displays/menus/aboutmenu.cpp displays/menus/accesspointwifisettingsmenu.cpp @@ -362,7 +369,7 @@ set(dependencies libsodium freertos nvs_flash esp_http_server esp_https_ota mdns app_update esp_system esp_websocket_client driver arduino-esp32 ArduinoJson esp-nimble-cpp FastLED-idf TFT_eSPI bobbycar-protocol cpputils cxx-ring-buffer date - espasynchttpreq espasyncota espchrono espcpputils esp-gui-lib esphttpdutils espwifistack expected fmt + espasynchttpreq espasyncota espchrono espcpputils espconfiglib esp-gui-lib esphttpdutils espwifistack expected fmt ) idf_component_register( diff --git a/main/accessors/globalaccessors.cpp b/main/accessors/globalaccessors.cpp index e69de29..3298cd7 100644 --- a/main/accessors/globalaccessors.cpp +++ b/main/accessors/globalaccessors.cpp @@ -0,0 +1 @@ +#include "globalaccessors.h" diff --git a/main/accessors/globalaccessors.h b/main/accessors/globalaccessors.h index 2faf7c7..f782ecb 100644 --- a/main/accessors/globalaccessors.h +++ b/main/accessors/globalaccessors.h @@ -5,14 +5,8 @@ #include "globals.h" #include "modes/tempomatmode.h" -using namespace espgui; +struct AvgSpeedAccessor : public espgui::RefAccessor { float &getRef() const override { return avgSpeed; } }; +struct AvgSpeedKmhAccessor : public espgui::RefAccessor { float &getRef() const override { return avgSpeedKmh; } }; +struct SumCurrentAccessor : public espgui::RefAccessor { float &getRef() const override { return sumCurrent; } }; -namespace { - -struct AvgSpeedAccessor : public RefAccessor { float &getRef() const override { return avgSpeed; } }; -struct AvgSpeedKmhAccessor : public RefAccessor { float &getRef() const override { return avgSpeedKmh; } }; -struct SumCurrentAccessor : public RefAccessor { float &getRef() const override { return sumCurrent; } }; - -struct TempomatModeCruiseMotTgtAccessor : public RefAccessor { int16_t &getRef() const override { return modes::tempomatMode.nCruiseMotTgt; } }; - -} // namespace +struct TempomatModeCruiseMotTgtAccessor : public espgui::RefAccessor { int16_t &getRef() const override { return modes::tempomatMode.nCruiseMotTgt; } }; diff --git a/main/accessors/settingsaccessors.cpp b/main/accessors/settingsaccessors.cpp index e69de29..d2a41b3 100644 --- a/main/accessors/settingsaccessors.cpp +++ b/main/accessors/settingsaccessors.cpp @@ -0,0 +1 @@ +#include "settingsaccessors.h" diff --git a/main/accessors/settingsaccessors.h b/main/accessors/settingsaccessors.h index 0ccd754..44a5504 100644 --- a/main/accessors/settingsaccessors.h +++ b/main/accessors/settingsaccessors.h @@ -1,18 +1,17 @@ #pragma once +// 3rdparty lib includes +#include + // local includes #include "globals.h" -#include "accessorinterface.h" #include "utils.h" -using namespace espgui; - -namespace { //! Special type of RefAccessor that also saves settings after setValue() template -struct RefAccessorSaveSettings : public virtual RefAccessor +struct RefAccessorSaveSettings : public virtual espgui::RefAccessor { - void setValue(T value) override { RefAccessor::setValue(value); saveSettings(); }; + void setValue(T value) override { espgui::RefAccessor::setValue(value); saveSettings(); }; }; #ifdef FEATURE_BMS @@ -26,7 +25,7 @@ struct ReverseBeepDuration1Accessor : public RefAccessorSaveSettings { struct IMotMaxAccessor : public RefAccessorSaveSettings { int16_t &getRef() const override { return settings.limits.iMotMax; } }; struct IDcMaxAccessor : public RefAccessorSaveSettings { int16_t &getRef() const override { return settings.limits.iDcMax; } }; -struct NMotMaxKmhAccessor : public virtual AccessorInterface +struct NMotMaxKmhAccessor : public virtual espgui::AccessorInterface { int16_t getValue() const override { return convertToKmh(settings.limits.nMotMax); } void setValue(int16_t value) override { settings.limits.nMotMax = convertFromKmh(value); saveSettings(); } @@ -50,7 +49,7 @@ struct CloudEnabledAccessor : public RefAccessorSaveSettings { bool &getRe struct CloudTransmitTimeoutAccessor : public RefAccessorSaveSettings { int16_t &getRef() const override { return settings.cloudSettings.cloudTransmitTimeout; } }; #endif -struct TimezoneOffsetAccessor : public virtual AccessorInterface +struct TimezoneOffsetAccessor : public virtual espgui::AccessorInterface { int32_t getValue() const override { return settings.timeSettings.timezoneOffset.count(); } void setValue(int32_t value) override { settings.timeSettings.timezoneOffset = espchrono::minutes32{value}; saveSettings(); } @@ -59,7 +58,7 @@ struct DaylightSavingModeAccessor : public RefAccessorSaveSettings { bool &getRef() const override { return settings.timeSettings.timeServerEnabled; } }; struct TimeSyncModeAccessor : public RefAccessorSaveSettings { sntp_sync_mode_t &getRef() const override { return settings.timeSettings.timeSyncMode; } }; -struct TimeSyncIntervalAccessor : public virtual AccessorInterface +struct TimeSyncIntervalAccessor : public virtual espgui::AccessorInterface { int32_t getValue() const override { return settings.timeSettings.timeSyncInterval.count(); } void setValue(int32_t value) override { settings.timeSettings.timeSyncInterval = espchrono::milliseconds32{value}; saveSettings(); } @@ -77,7 +76,7 @@ struct BackLeftInvertedAccessor : public RefAccessorSaveSettings { bool &g struct BackRightInvertedAccessor : public RefAccessorSaveSettings { bool &getRef() const override { return settings.controllerHardware.invertBackRight; } }; struct WheelDiameterMmAccessor : public RefAccessorSaveSettings { int16_t &getRef() const override { return settings.controllerHardware.wheelDiameter; } }; -struct WheelDiameterInchAccessor : public virtual AccessorInterface +struct WheelDiameterInchAccessor : public virtual espgui::AccessorInterface { float getValue() const override { return convertToInch(settings.controllerHardware.wheelDiameter); } void setValue(float value) override { settings.controllerHardware.wheelDiameter = convertFromInch(value); saveSettings(); } @@ -183,4 +182,3 @@ struct BatteryApplyCalibrationAccessor : public RefAccessorSaveSettings { struct LockscreenAllowPresetSwitchAccessor : public RefAccessorSaveSettings { bool &getRef() const override { return settings.lockscreen.allowPresetSwitch; } }; template struct LockscreenPinDigitAccessor : public RefAccessorSaveSettings { int8_t &getRef() const override { return settings.lockscreen.pin[index]; } }; -} diff --git a/main/accessors/wifiaccessors.cpp b/main/accessors/wifiaccessors.cpp index e69de29..c21c406 100644 --- a/main/accessors/wifiaccessors.cpp +++ b/main/accessors/wifiaccessors.cpp @@ -0,0 +1 @@ +#include "wifiaccessors.h" diff --git a/main/accessors/wifiaccessors.h b/main/accessors/wifiaccessors.h index 633e863..9242d74 100644 --- a/main/accessors/wifiaccessors.h +++ b/main/accessors/wifiaccessors.h @@ -2,8 +2,3 @@ // local includes #include "accessorinterface.h" - -using namespace espgui; - -namespace { -} diff --git a/main/actions/assertaction.cpp b/main/actions/assertaction.cpp new file mode 100644 index 0000000..5319528 --- /dev/null +++ b/main/actions/assertaction.cpp @@ -0,0 +1,9 @@ +#include "assertaction.h" + +// system includes +#include + +void AssertAction::triggered() +{ + assert(0); +} diff --git a/main/actions/assertaction.h b/main/actions/assertaction.h new file mode 100644 index 0000000..cfc2a09 --- /dev/null +++ b/main/actions/assertaction.h @@ -0,0 +1,10 @@ +#pragma once + +// 3rdparty lib includes +#include "actioninterface.h" + +class AssertAction : public virtual espgui::ActionInterface +{ +public: + void triggered() override; +}; diff --git a/main/actions/dividebyzeroaction.cpp b/main/actions/dividebyzeroaction.cpp new file mode 100644 index 0000000..82d4d8a --- /dev/null +++ b/main/actions/dividebyzeroaction.cpp @@ -0,0 +1,12 @@ +#include "dividebyzeroaction.h" + +// esp-idf includes +#include + +void DivideByZeroAction::triggered() +{ + int i = 1; + i--; + int goodbye = 42 / i; + ESP_LOGW("BOBBY", "divide by zero %i", goodbye); +} diff --git a/main/actions/dividebyzeroaction.h b/main/actions/dividebyzeroaction.h new file mode 100644 index 0000000..5fb6b82 --- /dev/null +++ b/main/actions/dividebyzeroaction.h @@ -0,0 +1,10 @@ +#pragma once + +// 3rdparty lib includes +#include "actioninterface.h" + +class DivideByZeroAction : public virtual espgui::ActionInterface +{ +public: + void triggered() override; +}; diff --git a/main/displays/ledstripcolorsdisplay.cpp b/main/displays/ledstripcolorsdisplay.cpp new file mode 100644 index 0000000..e69de29 diff --git a/main/displays/menus/ledstripcolorsmenu.h b/main/displays/ledstripcolorsdisplay.h similarity index 77% rename from main/displays/menus/ledstripcolorsmenu.h rename to main/displays/ledstripcolorsdisplay.h index 7960503..db350a6 100644 --- a/main/displays/menus/ledstripcolorsmenu.h +++ b/main/displays/ledstripcolorsdisplay.h @@ -1,31 +1,31 @@ #pragma once +// esp-idf includes +#include + +// 3rdparty lib includes #include #include #include +#include +#include +#include -// Local includes +// local includes #include "menudisplay.h" #include "utils.h" -#include "menuitem.h" #include "ledstrip.h" #include "icons/back.h" #include "icons/bobbycar.h" #include "texts.h" #include "actions/dummyaction.h" -#include "actions/switchscreenaction.h" -#include "actioninterface.h" #include "globals.h" -#include "esp_log.h" - -using namespace espgui; namespace { - class LedstripMenu; +class LedstripMenu; } namespace { - static int8_t selected_side = 7; static int8_t selected_color; bool state_select_color{false}; @@ -53,46 +53,56 @@ const std::array tft_colors = { TFT_MAGENTA }; -class LedstripColorsMenuBackAction : ActionInterface +class LedstripColorsDisplay : public espgui::DisplayWithTitle { -public: - void triggered() { - if(!state_select_color) - { - switchScreen(); - } - else - { - state_select_color = false; - tft.fillRect(0, 228, tft.width(), ((tft.width() - 40) / 8) + 4, TFT_BLACK); - } - } -}; + using Base = espgui::DisplayWithTitle; -class LedstripColorsMenu : - public MenuDisplay, - public StaticText, - public BackActionInterface -{ - using Base = MenuDisplay; public: + std::string text() const override; + void back() override; + void initScreen() override; void redraw() override; void rotate(int offset) override; void confirm() override; + void drawColors(); void drawSide(Bobbycar_Side side, unsigned int color); void clearSides(); - LedstripColorsMenu() {} + private: bool already_drew_circle{false}; }; -void LedstripColorsMenu::redraw() +std::string LedstripColorsDisplay::text() const { - Base::redraw(); + return TEXT_LEDSTRIPCOLORMENU; +} + +void LedstripColorsDisplay::back() +{ + if(!state_select_color) + { + switchScreen(); + } + else + { + state_select_color = false; + tft.fillRect(0, 228, tft.width(), ((tft.width() - 40) / 8) + 4, TFT_BLACK); + } +} + +void LedstripColorsDisplay::initScreen() +{ + Base::initScreen(); + tft.setSwapBytes(true); tft.pushImage(70, 60, bobbyicons::bobbycar.WIDTH, bobbyicons::bobbycar.HEIGHT, bobbyicons::bobbycar.buffer); tft.setSwapBytes(false); +} + +void LedstripColorsDisplay::redraw() +{ + Base::redraw(); auto y_pos = ((tft.width() - 40) / 8 + 4) + 240; if (last_state != state_select_color) @@ -103,22 +113,19 @@ void LedstripColorsMenu::redraw() tft.setTextFont(2); tft.setTextColor(TFT_WHITE); - if(state_select_color) + + tft.drawString(state_select_color ? + "Please select a color!" : + "Please select a side!", 50, y_pos); + + if (!already_drew_circle) { - tft.drawString("Please select a color!", 50, y_pos); - } - else - { - tft.drawString("Please select a side!", 50, y_pos); - } - if(!already_drew_circle) - { - this->drawSide(static_cast(selected_side), TFT_GOLD); + drawSide(static_cast(selected_side), TFT_GOLD); already_drew_circle = true; } } -void LedstripColorsMenu::rotate(int offset) +void LedstripColorsDisplay::rotate(int offset) { if (offset < 0) { @@ -161,22 +168,22 @@ void LedstripColorsMenu::rotate(int offset) if (state_select_color) { - this->drawColors(); + drawColors(); } else { tft.fillRect(0, 228, tft.width(), ((tft.width() - 40) / 8) + 4, TFT_BLACK); - this->clearSides(); - this->drawSide(static_cast(selected_side), TFT_GOLD); + clearSides(); + drawSide(static_cast(selected_side), TFT_GOLD); } } -void LedstripColorsMenu::confirm() +void LedstripColorsDisplay::confirm() { if(!state_select_color) { state_select_color = true; - this->drawColors(); + drawColors(); } else { @@ -189,7 +196,7 @@ void LedstripColorsMenu::confirm() } } -void LedstripColorsMenu::drawColors() +void LedstripColorsDisplay::drawColors() { uint16_t width = (tft.width() - 40); auto cube_width = width / 8; @@ -205,15 +212,15 @@ void LedstripColorsMenu::drawColors() } } -void LedstripColorsMenu::clearSides() +void LedstripColorsDisplay::clearSides() { for(int index = 0; index < 8; index++) { - this->drawSide(static_cast(index), TFT_BLACK); + drawSide(static_cast(index), TFT_BLACK); } } -void LedstripColorsMenu::drawSide(Bobbycar_Side side, unsigned int color) +void LedstripColorsDisplay::drawSide(Bobbycar_Side side, unsigned int color) { const auto middle = tft.width() / 2; const auto width = bobbyicons::bobbycar.WIDTH; diff --git a/main/displays/menus/crashmenu.h b/main/displays/menus/crashmenu.h index 474f1d7..20bc6f4 100644 --- a/main/displays/menus/crashmenu.h +++ b/main/displays/menus/crashmenu.h @@ -4,19 +4,14 @@ #include "menudisplay.h" #include "utils.h" #include "actions/dummyaction.h" +#include "actions/assertaction.h" +#include "actions/dividebyzeroaction.h" #include "icons/back.h" #include "texts.h" -#include - // forward declares namespace { class SettingsMenu; - -class AssertAction : public virtual ActionInterface { public: void triggered() override { assert(0); } }; -class DivideByZeroAction : public virtual ActionInterface { public: void triggered() override { int goodbye = 42 / 0; ESP_LOGW("divByZero", "%i", goodbye); } }; - - } // namespace using namespace espgui; diff --git a/main/displays/menus/ledstripmenu.h b/main/displays/menus/ledstripmenu.h index e447d73..c2e44a2 100644 --- a/main/displays/menus/ledstripmenu.h +++ b/main/displays/menus/ledstripmenu.h @@ -23,7 +23,7 @@ // forward declares namespace { class MainWindow; -class LedstripColorsMenu; +class LedstripColorsDisplay; } // namespace using namespace espgui; @@ -124,7 +124,7 @@ class LedstripMenu : public: LedstripMenu() { - constructMenuItem, SwitchScreenAction>>(); + constructMenuItem, SwitchScreenAction>>(); constructMenuItem, ToggleBoolAction, CheckboxIcon, EnableLedAnimationAccessor>>(); constructMenuItem, ToggleBoolAction, CheckboxIcon, EnableBrakeLightsAccessor>>(); constructMenuItem, ToggleBoolAction, CheckboxIcon, EnableBeepWhenBlinkAccessor>>(); diff --git a/main/main.cpp b/main/main.cpp index df8b287..e1a5400 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -62,7 +62,7 @@ using namespace std::chrono_literals; #include "displays/menus/tempomatmodesettingsmenu.h" #include "displays/menus/modessettingsmenu.h" #ifdef FEATURE_LEDSTRIP -#include "displays/menus/ledstripcolorsmenu.h" +#include "displays/ledstripcolorsdisplay.h" #endif #ifdef FEATURE_MOSFETS #include "displays/menus/mosfetsmenu.h" diff --git a/main/newsettings.cpp b/main/newsettings.cpp new file mode 100644 index 0000000..e69de29 diff --git a/main/newsettings.h b/main/newsettings.h new file mode 100644 index 0000000..e69de29 diff --git a/sdkconfig_comred b/sdkconfig_comred index 9643c42..d01fd21 100644 --- a/sdkconfig_comred +++ b/sdkconfig_comred @@ -180,6 +180,19 @@ CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP_INFO=y CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3 # end of Simple Async HTTP Request +# +# ESP Config lib settings +# +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_NONE is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_ERROR is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_WARN is not set +CONFIG_LOG_LOCAL_LEVEL_CONFIG_INFO=y +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_DEBUG is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_VERBOSE is not set +CONFIG_LOG_LOCAL_LEVEL_CONFIG=3 +# CONFIG_SEPARATE_FACTORY_NVS_PARTITION is not set +# end of ESP Config lib settings + # # espcpputils settings # diff --git a/sdkconfig_feedc0de b/sdkconfig_feedc0de index a93a616..166cc85 100644 --- a/sdkconfig_feedc0de +++ b/sdkconfig_feedc0de @@ -180,6 +180,19 @@ CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP_INFO=y CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3 # end of Simple Async HTTP Request +# +# ESP Config lib settings +# +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_NONE is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_ERROR is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_WARN is not set +CONFIG_LOG_LOCAL_LEVEL_CONFIG_INFO=y +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_DEBUG is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_VERBOSE is not set +CONFIG_LOG_LOCAL_LEVEL_CONFIG=3 +# CONFIG_SEPARATE_FACTORY_NVS_PARTITION is not set +# end of ESP Config lib settings + # # espcpputils settings # diff --git a/sdkconfig_greyhash b/sdkconfig_greyhash index ce542bc..6b03e24 100644 --- a/sdkconfig_greyhash +++ b/sdkconfig_greyhash @@ -180,6 +180,19 @@ CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP_INFO=y CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3 # end of Simple Async HTTP Request +# +# ESP Config lib settings +# +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_NONE is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_ERROR is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_WARN is not set +CONFIG_LOG_LOCAL_LEVEL_CONFIG_INFO=y +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_DEBUG is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_VERBOSE is not set +CONFIG_LOG_LOCAL_LEVEL_CONFIG=3 +# CONFIG_SEPARATE_FACTORY_NVS_PARTITION is not set +# end of ESP Config lib settings + # # espcpputils settings # diff --git a/sdkconfig_mick b/sdkconfig_mick index 43306d0..6f88e8c 100644 --- a/sdkconfig_mick +++ b/sdkconfig_mick @@ -180,6 +180,19 @@ CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP_INFO=y CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3 # end of Simple Async HTTP Request +# +# ESP Config lib settings +# +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_NONE is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_ERROR is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_WARN is not set +CONFIG_LOG_LOCAL_LEVEL_CONFIG_INFO=y +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_DEBUG is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_VERBOSE is not set +CONFIG_LOG_LOCAL_LEVEL_CONFIG=3 +# CONFIG_SEPARATE_FACTORY_NVS_PARTITION is not set +# end of ESP Config lib settings + # # espcpputils settings # diff --git a/sdkconfig_peter b/sdkconfig_peter index 9643c42..d01fd21 100644 --- a/sdkconfig_peter +++ b/sdkconfig_peter @@ -180,6 +180,19 @@ CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP_INFO=y CONFIG_LOG_LOCAL_LEVEL_ASYNC_HTTP=3 # end of Simple Async HTTP Request +# +# ESP Config lib settings +# +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_NONE is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_ERROR is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_WARN is not set +CONFIG_LOG_LOCAL_LEVEL_CONFIG_INFO=y +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_DEBUG is not set +# CONFIG_LOG_LOCAL_LEVEL_CONFIG_VERBOSE is not set +CONFIG_LOG_LOCAL_LEVEL_CONFIG=3 +# CONFIG_SEPARATE_FACTORY_NVS_PARTITION is not set +# end of ESP Config lib settings + # # espcpputils settings #