From aa9e5b2807ad4b3125db59c840e3789253d01c75 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Tue, 19 Oct 2021 15:30:54 +0200 Subject: [PATCH] Display current commit hash if ota is enabled --- main/displays/menus/aboutmenu.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/main/displays/menus/aboutmenu.h b/main/displays/menus/aboutmenu.h index 3f14ae1..4e8a8c5 100644 --- a/main/displays/menus/aboutmenu.h +++ b/main/displays/menus/aboutmenu.h @@ -8,6 +8,11 @@ #include "icons/back.h" #include "esptexthelpers.h" #include "texts.h" +#ifdef FEATURE_OTA +#include +#include +#include "fmt/core.h" +#endif // forward declares namespace { @@ -17,6 +22,18 @@ class SettingsMenu; using namespace espgui; 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"; class AboutMenu : @@ -27,7 +44,7 @@ class AboutMenu : public: AboutMenu() { - constructMenuItem, DummyAction>>(); + constructMenuItem>(); constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>();