WIP - bringup on PPR

This commit is contained in:
geeksville 2020-06-05 11:00:58 -07:00
parent 4b5cfaf9ba
commit 4db176867b
2 changed files with 7 additions and 5 deletions

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[platformio]
default_envs = tbeam ; Note: the github actions CI test build can't yet build NRF52 targets
default_envs = ppr ; Note: the github actions CI test build can't yet build NRF52 targets
[common]
; common is not currently used
@ -154,8 +154,6 @@ debug_init_break =
[env:nrf52dk]
extends = nrf52_base
board = nrf52840_dk_modified
lib_deps =
UC1701 ; for temp testing
; The PPR board
[env:ppr]

View File

@ -151,7 +151,8 @@ void setup()
#else
Wire.begin();
#endif
scanI2Cdevice();
// i2c still busted on new board
// scanI2Cdevice();
// Buttons & LED
#ifdef BUTTON_PIN
@ -180,6 +181,9 @@ void setup()
nrf52Setup();
#endif
extern void testLCD();
// testLCD();
// Initialize the screen first so we can show the logo while we start up everything else.
if (ssd1306_found)
screen.setup();
@ -233,7 +237,7 @@ void setup()
new SimRadio();
#endif
if (!rIf->init())
if (!rIf || !rIf->init())
recordCriticalError(ErrNoRadio);
else
router.addInterface(rIf);