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

Display current commit hash if ota is enabled

Browse Source
This commit is contained in:
CommanderRedYT
2021-10-19 15:30:54 +02:00
committed by 0xFEEDC0DE64
parent cde4c4601b
commit aa9e5b2807
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main/displays/menus/aboutmenu.h
View File

@ -8,6 +8,11 @@
#include "icons/back.h" #include "icons/back.h"
#include "esptexthelpers.h" #include "esptexthelpers.h"
#include "texts.h" #include "texts.h"
#ifdef FEATURE_OTA
#include <espasyncota.h>
#include <esp_ota_ops.h>
#include "fmt/core.h"
#endif
// forward declares // forward declares
namespace { namespace {
@ -17,6 +22,18 @@ class SettingsMenu;
using namespace espgui; using namespace espgui;
namespace { namespace {
class currentVersionText : public virtual TextInterface { public: std::string text() const override {
#ifdef FEATURE_OTA
if (const esp_app_desc_t *app_desc = esp_ota_get_app_description())
{
return fmt::format("Version: {}", app_desc->version);
}
#endif
return "Version: 1.0";
};
};
constexpr char TEXT_VERSION[] = "Version: 1.0"; constexpr char TEXT_VERSION[] = "Version: 1.0";
class AboutMenu : class AboutMenu :
@ -27,7 +44,7 @@ class AboutMenu :
public: public:
AboutMenu() AboutMenu()
{ {
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_VERSION>, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, currentVersionText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, HeapTotal8Text, StaticFont<2>, DisabledColor, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, HeapTotal8Text, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, HeapFree8Text, StaticFont<2>, DisabledColor, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, HeapFree8Text, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, HeapMinFree8Text, StaticFont<2>, DisabledColor, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, HeapMinFree8Text, StaticFont<2>, DisabledColor, DummyAction>>();