Cleanup to merge NR52 support back into mainline

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()
 {