Cleanup to merge NR52 support back into mainline

docs/software/TODO.md

@@ -1,19 +1,17 @@
 # High priority
 
-- why is the net so chatty now?
 - modem sleep should work if we lower serial rate to 115kb?
 - device wakes, turns BLE on and phone doesn't notice (while phone was sitting in auto-connect)
-- E22 bringup
 - encryption review findings writeup
 
 - turn on modem-sleep mode - https://github.com/espressif/arduino-esp32/issues/1142#issuecomment-512428852
-last EDF release in arduino is: https://github.com/espressif/arduino-esp32/commit/1977370e6fc069e93ffd8818798fbfda27ae7d99
+  last EDF release in arduino is: https://github.com/espressif/arduino-esp32/commit/1977370e6fc069e93ffd8818798fbfda27ae7d99
-IDF release/v3.3 46b12a560
+  IDF release/v3.3 46b12a560
-IDF release/v3.3 367c3c09c
+  IDF release/v3.3 367c3c09c
-https://docs.espressif.com/projects/esp-idf/en/release-v3.3/get-started/linux-setup.html
+  https://docs.espressif.com/projects/esp-idf/en/release-v3.3/get-started/linux-setup.html
-kevinh@kevin-server:~/development/meshtastic/esp32-arduino-lib-builder$ python /home/kevinh/development/meshtastic/esp32-arduino-lib-builder/esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dout --flash_freq 40m --flash_size detect 0x1000 /home/kevinh/development/meshtastic/esp32-arduino-lib-builder/build/bootloader/bootloader.bin
+  kevinh@kevin-server:~/development/meshtastic/esp32-arduino-lib-builder\$ python /home/kevinh/development/meshtastic/esp32-arduino-lib-builder/esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dout --flash_freq 40m --flash_size detect 0x1000 /home/kevinh/development/meshtastic/esp32-arduino-lib-builder/build/bootloader/bootloader.bin
-cp -a out/tools/sdk/* components/arduino/tools/sdk
+  cp -a out/tools/sdk/_ components/arduino/tools/sdk
-cp -ar components/arduino/* ~/.platformio/packages/framework-arduinoespressif32@src-fba9d33740f719f712e9f8b07da6ea13/
+  cp -ar components/arduino/_ ~/.platformio/packages/framework-arduinoespressif32@src-fba9d33740f719f712e9f8b07da6ea13/
 
 # Medium priority
 

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = ppr ; Note: the github actions CI test build can't yet build NRF52 targets
+default_envs = tbeam ; Note: the github actions CI test build can't yet build NRF52 targets
 
 [common]
 ; common is not currently used

src/main.cpp

@@ -153,7 +153,9 @@ void setup()
     Wire.begin();
 #endif
     // i2c still busted on new board
-    // scanI2Cdevice();
+#ifndef ARDUINO_NRF52840_PPR
+    scanI2Cdevice();
+#endif
 
     // Buttons & LED
 #ifdef BUTTON_PIN
@@ -182,9 +184,6 @@ 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();

src/nrf52/main-nrf52.cpp

@@ -59,12 +59,6 @@ void setBluetoothEnable(bool on)
     }
 }
 
-#ifdef ARDUINO_NRF52840_PPR
-#include "PmuBQ25703A.h"
-
-PmuBQ25703A pmu;
-#endif
-
 void nrf52Setup()
 {