From 483b5ee4e3fbd55fb0c450a597f3665db0cea825 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Mon, 3 Jan 2022 18:16:48 +0100 Subject: [PATCH] Added debug text for can resets --- main/can.cpp | 3 +-- main/can.h | 2 +- main/displays/menus/debugmenu.cpp | 1 + main/esptexthelpers.h | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/main/can.cpp b/main/can.cpp index 914f839..98adb1f 100644 --- a/main/can.cpp +++ b/main/can.cpp @@ -24,6 +24,7 @@ using namespace std::chrono_literals; namespace can { +uint32_t can_total_error_cnt; namespace { constexpr const char * const TAG = "BOBBYCAN"; } // namespace @@ -257,8 +258,6 @@ void parseCanInput() void sendCanCommands() { - - static uint32_t can_total_error_cnt = 0; static uint32_t can_sequential_error_cnt = 0; constexpr auto send = [](uint32_t addr, auto value){ diff --git a/main/can.h b/main/can.h index 2aa167c..bd0b571 100644 --- a/main/can.h +++ b/main/can.h @@ -14,7 +14,7 @@ #endif namespace can { - +extern uint32_t can_total_error_cnt; extern std::optional can_gas, can_brems; extern espchrono::millis_clock::time_point last_can_gas, last_can_brems; diff --git a/main/displays/menus/debugmenu.cpp b/main/displays/menus/debugmenu.cpp index e20e527..c5f4665 100644 --- a/main/displays/menus/debugmenu.cpp +++ b/main/displays/menus/debugmenu.cpp @@ -63,6 +63,7 @@ DebugMenu::DebugMenu() constructMenuItem, BobbyCheckbox, CloudDebugEnableAccessor>>(); #endif constructMenuItem, DisabledColor, DummyAction>>(); + constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem>(); constructMenuItem, SwitchScreenAction>>(); constructMenuItem, SwitchScreenAction>>(); diff --git a/main/esptexthelpers.h b/main/esptexthelpers.h index d312f63..f744cba 100644 --- a/main/esptexthelpers.h +++ b/main/esptexthelpers.h @@ -8,6 +8,7 @@ #include // local includes +#include "can.h" #include "textinterface.h" //template @@ -40,6 +41,9 @@ 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())); }}; +class CanIcCrashText : public virtual espgui::TextInterface { public: std::string text() const override { + return fmt::format("CAN IC reseted: {}", can::can_total_error_cnt); }}; + constexpr char TEXT_ESPCHIPREVISION[] = "Chip revision: "; using EspChipRevisionText = espgui::StaticText; //EspStatusTextHelper;