Merge remote-tracking branch 'origin/dev-wifi'

This commit is contained in:
Jm Casler
2020-09-22 22:00:07 -07:00
15 changed files with 1028 additions and 58 deletions

View File

@@ -10,6 +10,8 @@ extern bool ssd1306_found;
extern bool isCharging;
extern bool isUSBPowered;
// Global Screen singleton.
extern graphics::Screen screen;
//extern Observable<meshtastic::PowerStatus> newPowerStatus; //TODO: move this to main-esp32.cpp somehow or a helper class
@@ -23,4 +25,4 @@ const char *getDeviceName();
void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop();
void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop();