feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #320 from bobbycar-graz/about-menu

Browse Source 
Fixed a few menu items from about menu
This commit is contained in:
CommanderRedYT
2022-05-16 00:20:00 +02:00
committed by GitHub
parent 3818e50eab 9190cb6634
commit b7b86a5e8a
5 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/displays/menus/aboutmenu.cpp
View File

@ -47,8 +47,8 @@ AboutMenu::AboutMenu()
constructMenuItem<makeComponent<MenuItem, HeapLargest32Text, StaticFont<2>, DisabledColor, DummyAction>>();
#endif
constructMenuItem<makeComponent<MenuItem, EspChipRevisionText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EspCpuFreqMHzText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EspCycleCountText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EspCpuMinFreqMHzText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EspCpuMaxFreqMHzText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EspSdkVersionText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EspFlashChipSizeText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EspFlashChipSpeedText, StaticFont<2>, DisabledColor, DummyAction>>();

23
main/esptexthelpers.h
View File

@ -2,12 +2,15 @@
// esp-idf includes
#include <esp_heap_caps.h>
#include <esp_chip_info.h>
#include <esp_idf_version.h>
// 3rdparty lib includes
#include <fmt/core.h>
#include <espstrutils.h>
// 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<TEXT_ESPCHIPREVISION>; //EspStatusTextHelper<TEXT_ESPCHIPREVISION, uint8_t, &EspClass::getChipRevision>;
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<TEXT_ESPCPUFREQMHZ>; //EspStatusTextHelper<TEXT_ESPCPUFREQMHZ, uint32_t, &EspClass::getCpuFreqMHz>;
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<TEXT_ESPCYCLECOUNT>; //EspStatusTextHelper<TEXT_ESPCYCLECOUNT, uint32_t, &EspClass::getCycleCount>;
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<TEXT_ESPSDKVERSION>; //EspStatusTextHelper<TEXT_ESPSDKVERSION, const char *, &EspClass::getSdkVersion>;
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<TEXT_ESPFLASHCHIPSIZE>; //EspStatusTextHelper<TEXT_ESPFLASHCHIPSIZE, uint32_t, &EspClass::getFlashChipSize>;

3
main/globals.cpp
View File

@ -21,6 +21,9 @@ std::optional<int> sunrise;
std::optional<int> sunset;
std::optional<espchrono::DateTime> sunrise_dt;
esp_chip_info_t chip_info;
esp_pm_config_esp32_t pm_config;
#ifdef GLOBALS_SOURCE
GLOBALS_SOURCE
#endif

7
main/globals.h
View File

@ -14,6 +14,10 @@
#endif
#include <SPI.h>
// esp-idf includes
#include <esp_chip_info.h>
#include <esp32/pm.h>
// 3rdparty lib includes
#include <espchrono.h>
#include <TFT_eSPI.h>
@ -43,6 +47,9 @@ extern std::optional<int> sunrise;
extern std::optional<int> sunset;
extern std::optional<espchrono::DateTime> 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;

6
main/main.cpp
View File

@ -4,6 +4,9 @@ constexpr const char * const TAG = "BOBBY";
#include <cstdio>
// esp-idf includes
#include <esp32/pm.h>
#include <esp_pm.h>
#include <esp_chip_info.h>
#include <esp_log.h>
// 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();