diff --git a/main/displays/menus/aboutmenu.cpp b/main/displays/menus/aboutmenu.cpp index 04cf742..da28283 100644 --- a/main/displays/menus/aboutmenu.cpp +++ b/main/displays/menus/aboutmenu.cpp @@ -45,6 +45,7 @@ AboutMenu::AboutMenu() constructMenuItem, DisabledColor, DummyAction>>(); #endif 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 edd9382..ff1c331 100644 --- a/main/esptexthelpers.h +++ b/main/esptexthelpers.h @@ -1,18 +1,19 @@ #pragma once // esp-idf includes -#include #include +#include #include // 3rdparty lib includes -#include #include +#include // local includes -#include "globals.h" #include "can.h" +#include "globals.h" #include "textinterface.h" +#include "utils.h" //template //using EspStatusTextHelper = StatusTextHelper; @@ -54,6 +55,11 @@ class EspChipRevisionText : public virtual espgui::TextInterface { public: std:: return fmt::format("{}{}", TEXT_ESPCHIPREVISION, chip_info.revision); }}; +constexpr char TEXT_ESPCHIPMODEL[] = "Chip Model: "; +class EspChipModelText : public virtual espgui::TextInterface { public: std::string text() const override { + return fmt::format("{}{}", TEXT_ESPCHIPMODEL, toString(chip_info.model)); + }}; + 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); diff --git a/main/utils.cpp b/main/utils.cpp index 1f83cab..6bd27d7 100644 --- a/main/utils.cpp +++ b/main/utils.cpp @@ -359,3 +359,24 @@ bool is_valid_timestamp(espchrono::utc_clock::time_point timestamp) using namespace date; return timestamp.time_since_epoch() > sys_seconds{sys_days{1_d/January/2000}}.time_since_epoch(); } + +std::string toString(esp_chip_model_t esp_chip_model) +{ + switch (esp_chip_model) + { + case CHIP_ESP32: + return "ESP32"; + case CHIP_ESP32S2: + return "ESP32S2"; + case CHIP_ESP32S3: + return "ESP32S3"; + case CHIP_ESP32C3: + return "ESP32C3"; + case CHIP_ESP32H2: + return "ESP32H2"; + case CHIP_ESP32C2: + return "ESP32C2"; + default: + return "invalid"; + } +} diff --git a/main/utils.h b/main/utils.h index fbd440c..8139a96 100644 --- a/main/utils.h +++ b/main/utils.h @@ -100,6 +100,8 @@ std::string get_wifi_security_string(wifi_auth_mode_t authMode); float float_map(float x, float in_min, float in_max, float out_min, float out_max); bool is_valid_timestamp(espchrono::utc_clock::time_point timestamp); +std::string toString(esp_chip_model_t esp_chip_model); + namespace bobbydpad { #ifdef FEATURE_DPAD static constexpr const auto ButtonCount = dpad::BUTTON_COUNT;