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

Merge pull request #227 from bobbycar-graz/fix-candebugmenu-old-idf

Browse Source 
Fix CanDebugMenu for old IDF
This commit is contained in:
Daniel Brunner
2022-01-04 03:01:51 +01:00
committed by GitHub
parent 78512b17dc 68b15c0dbe
commit ce3885b7e0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/displays/menus/candebugmenu.cpp
View File

@ -118,6 +118,7 @@ protected:
std::string canStatusText(const twai_status_info_t &can_status_info) const override { return std::to_string(can_status_info.rx_missed_count); } std::string canStatusText(const twai_status_info_t &can_status_info) const override { return std::to_string(can_status_info.rx_missed_count); }
}; };
#ifndef OLD_IDF
class CanStatusRxOverrunCountText : public CanStatusText class CanStatusRxOverrunCountText : public CanStatusText
{ {
public: public:
@ -127,6 +128,7 @@ protected:
std::string canStatusName() const override { return "&srx_overrun_count"; } std::string canStatusName() const override { return "&srx_overrun_count"; }
std::string canStatusText(const twai_status_info_t &can_status_info) const override { return std::to_string(can_status_info.rx_overrun_count); } std::string canStatusText(const twai_status_info_t &can_status_info) const override { return std::to_string(can_status_info.rx_overrun_count); }
}; };
#endif
class CanStatusArbLostCountText : public CanStatusText class CanStatusArbLostCountText : public CanStatusText
{ {
@ -185,7 +187,9 @@ CanDebugMenu::CanDebugMenu()
constructMenuItem<makeComponentArgs<MenuItem, CanStatusRxErrorCounterText, DummyAction>>(m_last_can_status_info); constructMenuItem<makeComponentArgs<MenuItem, CanStatusRxErrorCounterText, DummyAction>>(m_last_can_status_info);
constructMenuItem<makeComponentArgs<MenuItem, CanStatusTxFailedCountText, DummyAction>>(m_last_can_status_info); constructMenuItem<makeComponentArgs<MenuItem, CanStatusTxFailedCountText, DummyAction>>(m_last_can_status_info);
constructMenuItem<makeComponentArgs<MenuItem, CanStatusRxFailedCountText, DummyAction>>(m_last_can_status_info); constructMenuItem<makeComponentArgs<MenuItem, CanStatusRxFailedCountText, DummyAction>>(m_last_can_status_info);
#ifndef OLD_IDF
constructMenuItem<makeComponentArgs<MenuItem, CanStatusRxOverrunCountText, DummyAction>>(m_last_can_status_info); constructMenuItem<makeComponentArgs<MenuItem, CanStatusRxOverrunCountText, DummyAction>>(m_last_can_status_info);
#endif
constructMenuItem<makeComponentArgs<MenuItem, CanStatusArbLostCountText, DummyAction>>(m_last_can_status_info); constructMenuItem<makeComponentArgs<MenuItem, CanStatusArbLostCountText, DummyAction>>(m_last_can_status_info);
constructMenuItem<makeComponentArgs<MenuItem, CanStatusBusErrorCountText, DummyAction>>(m_last_can_status_info); constructMenuItem<makeComponentArgs<MenuItem, CanStatusBusErrorCountText, DummyAction>>(m_last_can_status_info);
constructMenuItem<makeComponentArgs<MenuItem, CanPendingTxCountText, DummyAction>>(); constructMenuItem<makeComponentArgs<MenuItem, CanPendingTxCountText, DummyAction>>();