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

Merge pull request #217 from bobbycar-graz/debug-text

Browse Source
This commit is contained in:
CommanderRedYT
2022-01-03 18:25:45 +01:00
committed by GitHub
parent 41b54a2a5f 483b5ee4e3
commit bdbfde6868
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/can.cpp
View File

@ -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){

2
main/can.h
View File

@ -14,7 +14,7 @@
#endif
namespace can {
extern uint32_t can_total_error_cnt;
extern std::optional<int16_t> can_gas, can_brems;
extern espchrono::millis_clock::time_point last_can_gas, last_can_brems;

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

@ -63,6 +63,7 @@ DebugMenu::DebugMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_TOGGLECLOUDDEBUG>, BobbyCheckbox, CloudDebugEnableAccessor>>();
#endif
constructMenuItem<makeComponent<MenuItem, LastRebootReasonText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, CanIcCrashText, StaticFont<2>, DisabledColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EmptyText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_FRONTCOMMAND>, SwitchScreenAction<FrontCommandDebugMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACKCOMMAND>, SwitchScreenAction<BackCommandDebugMenu>>>();

4
main/esptexthelpers.h
View File

@ -8,6 +8,7 @@
#include <espstrutils.h>
// local includes
#include "can.h"
#include "textinterface.h"
//template<const char *Ttext, typename TreturnType, TreturnType (EspClass::*Tmethod)()>
@ -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<TEXT_ESPCHIPREVISION>; //EspStatusTextHelper<TEXT_ESPCHIPREVISION, uint8_t, &EspClass::getChipRevision>;