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

Added more debug text

Browse Source
This commit is contained in:
CommanderRedYT
2022-10-06 11:22:21 +02:00
parent 33f35f14b7
commit 79e51f7511
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,7 @@ AboutMenu::AboutMenu()
constructMenuItem<makeComponent<MenuItem, HeapLargest32Text, StaticFont<2>, DisabledColor, DummyAction>>();
#endif
constructMenuItem<makeComponent<MenuItem, EspChipRevisionText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EspChipModelText, 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>>();

12
main/esptexthelpers.h
View File

@ -1,18 +1,19 @@
#pragma once
// esp-idf includes
#include <esp_heap_caps.h>
#include <esp_chip_info.h>
#include <esp_heap_caps.h>
#include <esp_idf_version.h>
// 3rdparty lib includes
#include <fmt/core.h>
#include <espstrutils.h>
#include <fmt/core.h>
// local includes
#include "globals.h"
#include "can.h"
#include "globals.h"
#include "textinterface.h"
#include "utils.h"
//template<const char *Ttext, typename TreturnType, TreturnType (EspClass::*Tmethod)()>
//using EspStatusTextHelper = StatusTextHelper<Ttext, EspClass, &ESP, TreturnType, Tmethod>;
@ -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);

21
main/utils.cpp
View File

@ -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";
}
}

2
main/utils.h
View File

@ -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;