From 18ba362d611bcc78d5ce7316d8ffc46c20b3f734 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Tue, 18 Jan 2022 09:54:16 +0100 Subject: [PATCH] Fixed compiling for absolutely no features --- main/displays/menus/debugmenu.cpp | 4 ++++ main/esptexthelpers.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/main/displays/menus/debugmenu.cpp b/main/displays/menus/debugmenu.cpp index 1f5794f..1ffc389 100644 --- a/main/displays/menus/debugmenu.cpp +++ b/main/displays/menus/debugmenu.cpp @@ -63,7 +63,9 @@ DebugMenu::DebugMenu() { using namespace espgui; constructMenuItem, SwitchScreenAction>>(); +#ifdef FEATURE_CAN constructMenuItem, SwitchScreenAction>>(); +#endif constructMenuItem, SwitchScreenAction>>(); constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&bobbyicons::battery>>>(); if (configs.feature.udpcloud.value) @@ -71,7 +73,9 @@ DebugMenu::DebugMenu() constructMenuItem, BobbyCheckbox, CloudDebugEnableAccessor>>(); } constructMenuItem, DisabledColor, DummyAction>>(); +#ifdef FEATURE_CAN constructMenuItem, DisabledColor, DummyAction>>(); +#endif constructMenuItem>(); constructMenuItem, SwitchScreenAction>>(); constructMenuItem, SwitchScreenAction>>(); diff --git a/main/esptexthelpers.h b/main/esptexthelpers.h index f744cba..ca3bf31 100644 --- a/main/esptexthelpers.h +++ b/main/esptexthelpers.h @@ -41,8 +41,10 @@ class HeapLargest32Text : public virtual espgui::TextInterface { public: std::st class LastRebootReasonText : public virtual espgui::TextInterface { public: std::string text() const override { return fmt::format("Last Reboot Reason: {}", espcpputils::toString(esp_reset_reason())); }}; +#ifdef FEATURE_CAN class CanIcCrashText : public virtual espgui::TextInterface { public: std::string text() const override { return fmt::format("CAN IC reseted: {}", can::can_total_error_cnt); }}; +#endif constexpr char TEXT_ESPCHIPREVISION[] = "Chip revision: "; using EspChipRevisionText = espgui::StaticText; //EspStatusTextHelper;