rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-20 17:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored status handlers and merged

Browse Source
This commit is contained in:
Professr
2020-06-28 18:17:52 -07:00
parent 5317895a5e be8e663d39
commit f5b7c33d4e
20 changed files with 426 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.cpp
View File

@@ -57,13 +57,13 @@
meshtastic::Screen screen(SSD1306_ADDRESS);
// Global power status
meshtastic::PowerStatusHandler *powerStatusHandler = new meshtastic::PowerStatusHandler();
meshtastic::PowerStatus *powerStatus = new meshtastic::PowerStatus();
// Global GPS status
meshtastic::GPSStatusHandler *gpsStatusHandler = new meshtastic::GPSStatusHandler();
meshtastic::GPSStatus *gpsStatus = new meshtastic::GPSStatus();
// Global Node status
meshtastic::NodeStatusHandler *nodeStatusHandler = new meshtastic::NodeStatusHandler();
meshtastic::NodeStatus *nodeStatus = new meshtastic::NodeStatus();
bool ssd1306_found;
bool axp192_found;
@@ -127,7 +127,7 @@ static uint32_t ledBlinker()
setLed(ledOn);
// have a very sparse duty cycle of LED being on, unless charging, then blink 0.5Hz square wave rate to indicate that
return powerStatusHandler->isCharging() ? 1000 : (ledOn ? 2 : 1000);
return powerStatus->getIsCharging() ? 1000 : (ledOn ? 2 : 1000);
}
Periodic ledPeriodic(ledBlinker);
@@ -231,8 +231,8 @@ void setup()
esp32Setup();
power = new Power();
power->setup();
power->setStatusHandler(powerStatusHandler);
powerStatusHandler->observe(&power->newStatus);
power->setStatusHandler(powerStatus);
powerStatus->observe(&power->newStatus);
#endif
#ifdef NRF52_SERIES
@@ -263,8 +263,8 @@ void setup()
gps = new NEMAGPS();
gps->setup();
#endif
gpsStatusHandler->observe(&gps->newStatus);
nodeStatusHandler->observe(&nodeDB.newStatus);
gpsStatus->observe(&gps->newStatus);
nodeStatus->observe(&nodeDB.newStatus);
service.init();
#ifndef NO_ESP32