diff --git a/main/displays/menus/aboutmenu.cpp b/main/displays/menus/aboutmenu.cpp index e42e905..cb2bc57 100644 --- a/main/displays/menus/aboutmenu.cpp +++ b/main/displays/menus/aboutmenu.cpp @@ -47,8 +47,8 @@ AboutMenu::AboutMenu() constructMenuItem, DisabledColor, DummyAction>>(); #endif constructMenuItem, DisabledColor, DummyAction>>(); - constructMenuItem, DisabledColor, DummyAction>>(); - constructMenuItem, DisabledColor, DummyAction>>(); + constructMenuItem, DisabledColor, DummyAction>>(); + constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); diff --git a/main/esptexthelpers.h b/main/esptexthelpers.h index ca3bf31..edd9382 100644 --- a/main/esptexthelpers.h +++ b/main/esptexthelpers.h @@ -2,12 +2,15 @@ // esp-idf includes #include +#include +#include // 3rdparty lib includes #include #include // local includes +#include "globals.h" #include "can.h" #include "textinterface.h" @@ -47,16 +50,24 @@ class CanIcCrashText : public virtual espgui::TextInterface { public: std::strin #endif constexpr char TEXT_ESPCHIPREVISION[] = "Chip revision: "; -using EspChipRevisionText = espgui::StaticText; //EspStatusTextHelper; +class EspChipRevisionText : public virtual espgui::TextInterface { public: std::string text() const override { + return fmt::format("{}{}", TEXT_ESPCHIPREVISION, chip_info.revision); +}}; -constexpr char TEXT_ESPCPUFREQMHZ[] = "Cpu freq MHz: "; -using EspCpuFreqMHzText = espgui::StaticText; //EspStatusTextHelper; +constexpr char TEXT_ESPMAXCPUFREQMHZ[] = "Cpu max freq MHz: "; +class EspCpuMaxFreqMHzText : public virtual espgui::TextInterface { public: std::string text() const override { + return fmt::format("{}{}", TEXT_ESPMAXCPUFREQMHZ, pm_config.max_freq_mhz); +}}; -constexpr char TEXT_ESPCYCLECOUNT[] = "Cycle count: "; -using EspCycleCountText = espgui::StaticText; //EspStatusTextHelper; +constexpr char TEXT_ESPMINCPUFREQMHZ[] = "Cpu max freq MHz: "; +class EspCpuMinFreqMHzText : public virtual espgui::TextInterface { public: std::string text() const override { + return fmt::format("{}{}", TEXT_ESPMINCPUFREQMHZ, pm_config.min_freq_mhz); +}}; constexpr char TEXT_ESPSDKVERSION[] = "Sdk version: "; -using EspSdkVersionText = espgui::StaticText; //EspStatusTextHelper; +class EspSdkVersionText : public virtual espgui::TextInterface { public: std::string text() const override { + return fmt::format("{}{}", TEXT_ESPSDKVERSION, esp_get_idf_version()); +}}; constexpr char TEXT_ESPFLASHCHIPSIZE[] = "Flash chip size: "; using EspFlashChipSizeText = espgui::StaticText; //EspStatusTextHelper; diff --git a/main/globals.cpp b/main/globals.cpp index 0ba006d..afb3426 100644 --- a/main/globals.cpp +++ b/main/globals.cpp @@ -21,6 +21,9 @@ std::optional sunrise; std::optional sunset; std::optional sunrise_dt; +esp_chip_info_t chip_info; +esp_pm_config_esp32_t pm_config; + #ifdef GLOBALS_SOURCE GLOBALS_SOURCE #endif diff --git a/main/globals.h b/main/globals.h index 3f86d84..aa3c767 100644 --- a/main/globals.h +++ b/main/globals.h @@ -14,6 +14,10 @@ #endif #include +// esp-idf includes +#include +#include + // 3rdparty lib includes #include #include @@ -43,6 +47,9 @@ extern std::optional sunrise; extern std::optional sunset; extern std::optional sunrise_dt; +extern esp_chip_info_t chip_info; +extern esp_pm_config_esp32_t pm_config; + extern float avgSpeed; extern float avgSpeedKmh; extern float sumCurrent; diff --git a/main/main.cpp b/main/main.cpp index e463065..3fb99ff 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -4,6 +4,9 @@ constexpr const char * const TAG = "BOBBY"; #include // esp-idf includes +#include +#include +#include #include // 3rdparty lib includes @@ -101,6 +104,9 @@ extern "C" void app_main() } } + esp_chip_info(&chip_info); + esp_pm_get_configuration(&pm_config); + while (true) { const auto now = espchrono::millis_clock::now();