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

Added raw poti graphs

Browse Source
This commit is contained in:
CommanderRedYT
2022-10-21 21:18:31 +02:00
parent 846a5d753a
commit 43c2338dbd
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/displays/bobbygraphdisplay.h
View File

@ -38,7 +38,7 @@ void BobbyGraphDisplay<COUNT>::rawButtonReleased(uint8_t button)
template<size_t COUNT> template<size_t COUNT>
void BobbyGraphDisplay<COUNT>::buttonPressed(espgui::Button button) void BobbyGraphDisplay<COUNT>::buttonPressed(espgui::Button button)
{ {
//Base::buttonPressed(button); Base::buttonPressed(button);
buttonPressedCommon(button); buttonPressedCommon(button);
} }

18
main/displays/menus/graphsmenu.cpp
View File

@ -15,6 +15,8 @@
namespace { namespace {
constexpr char TEXT_GRAPHS[] = "Graphs"; constexpr char TEXT_GRAPHS[] = "Graphs";
constexpr char TEXT_RAW_GAS[] = "Raw Gas";
constexpr char TEXT_RAW_BREMS[] = "Raw Brems";
constexpr char TEXT_GAS[] = "Gas"; constexpr char TEXT_GAS[] = "Gas";
constexpr char TEXT_BREMS[] = "Brems"; constexpr char TEXT_BREMS[] = "Brems";
constexpr char TEXT_POTIS[] = "Potis"; constexpr char TEXT_POTIS[] = "Potis";
@ -32,6 +34,20 @@ constexpr char TEXT_MOTORCURRENTS[] = "Motor currents";
constexpr char TEXT_RSSI[] = "RSSI"; constexpr char TEXT_RSSI[] = "RSSI";
constexpr char TEXT_BACK[] = "Back"; constexpr char TEXT_BACK[] = "Back";
using RawGasGraphDisplay = espgui::makeComponent<
BobbyGraphDisplay<1>,
espgui::StaticText<TEXT_RAW_GAS>,
espgui::SingleGraphAccessor<RawGasStatistics>,
espgui::ConfirmActionInterface<espgui::PopScreenAction>,
espgui::BackActionInterface<espgui::PopScreenAction>
>;
using RawBremsGraphDisplay = espgui::makeComponent<
BobbyGraphDisplay<1>,
espgui::StaticText<TEXT_RAW_BREMS>,
espgui::SingleGraphAccessor<RawBremsStatistics>,
espgui::ConfirmActionInterface<espgui::PopScreenAction>,
espgui::BackActionInterface<espgui::PopScreenAction>
>;
using GasGraphDisplay = espgui::makeComponent< using GasGraphDisplay = espgui::makeComponent<
BobbyGraphDisplay<1>, BobbyGraphDisplay<1>,
espgui::StaticText<TEXT_GAS>, espgui::StaticText<TEXT_GAS>,
@ -173,6 +189,8 @@ using RssiGraphDisplay = espgui::makeComponent<
GraphsMenu::GraphsMenu() GraphsMenu::GraphsMenu()
{ {
using namespace espgui; using namespace espgui;
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RAW_GAS>, PushScreenAction<RawGasGraphDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_RAW_BREMS>, PushScreenAction<RawBremsGraphDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GAS>, PushScreenAction<GasGraphDisplay>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GAS>, PushScreenAction<GasGraphDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BREMS>, PushScreenAction<BremsGraphDisplay>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BREMS>, PushScreenAction<BremsGraphDisplay>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_POTIS>, PushScreenAction<PotisGraphDisplay>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_POTIS>, PushScreenAction<PotisGraphDisplay>>>();

6
main/statistics.cpp
View File

@ -1,7 +1,7 @@
#include "statistics.h" #include "statistics.h"
namespace statistics { namespace statistics {
ContainerType gas, brems, avgSpeed, avgSpeedKmh, sumCurrent, frontVoltage, backVoltage, frontLeftCurrent, frontRightCurrent, backLeftCurrent, backRightCurrent, ContainerType raw_gas, raw_brems, gas, brems, avgSpeed, avgSpeedKmh, sumCurrent, frontVoltage, backVoltage, frontLeftCurrent, frontRightCurrent, backLeftCurrent, backRightCurrent,
#ifdef FEATURE_BMS #ifdef FEATURE_BMS
bmsVoltage, bmsCurrent, bmsPower, bmsVoltage, bmsCurrent, bmsPower,
#endif #endif
@ -10,6 +10,10 @@ ContainerType gas, brems, avgSpeed, avgSpeedKmh, sumCurrent, frontVoltage, backV
void pushStats() void pushStats()
{ {
if (raw_gas)
statistics::raw_gas.push_back(*raw_gas);
if (raw_brems)
statistics::raw_brems.push_back(*raw_brems);
if (gas) if (gas)
statistics::gas.push_back(*gas); statistics::gas.push_back(*gas);
if (brems) if (brems)

4
main/statistics.h
View File

@ -11,7 +11,7 @@
namespace statistics { namespace statistics {
using ContainerType = ring_buffer<float, 200>; using ContainerType = ring_buffer<float, 200>;
extern ContainerType gas, brems, avgSpeed, avgSpeedKmh, sumCurrent, frontVoltage, backVoltage, frontLeftCurrent, frontRightCurrent, backLeftCurrent, backRightCurrent, extern ContainerType raw_gas, raw_brems, gas, brems, avgSpeed, avgSpeedKmh, sumCurrent, frontVoltage, backVoltage, frontLeftCurrent, frontRightCurrent, backLeftCurrent, backRightCurrent,
#ifdef FEATURE_BMS #ifdef FEATURE_BMS
bmsVoltage, bmsCurrent, bmsPower, bmsVoltage, bmsCurrent, bmsPower,
#endif #endif
@ -33,6 +33,8 @@ public:
const statistics::ContainerType &getBuffer() const override { return T; } const statistics::ContainerType &getBuffer() const override { return T; }
}; };
using RawGasStatistics = BufferAccessorImpl<statistics::raw_gas>;
using RawBremsStatistics = BufferAccessorImpl<statistics::raw_brems>;
using GasStatistics = BufferAccessorImpl<statistics::gas>; using GasStatistics = BufferAccessorImpl<statistics::gas>;
using BremsStatistics = BufferAccessorImpl<statistics::brems>; using BremsStatistics = BufferAccessorImpl<statistics::brems>;
using AvgSpeedStatistics = BufferAccessorImpl<statistics::avgSpeed>; using AvgSpeedStatistics = BufferAccessorImpl<statistics::avgSpeed>;