Update ESP32 build to work with latest NRF52 changes

src/configuration.h

@@ -109,6 +109,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Leave undefined to disable our PMU IRQ handler
 #define PMU_IRQ 35
 
+#define AXP192_SLAVE_ADDRESS 0x34
+
 #elif defined(TBEAM_V07)
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR "tbeam0.7"
@@ -244,6 +246,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // AXP192 (Rev1-specific options)
 // -----------------------------------------------------------------------------
 
-// #define AXP192_SLAVE_ADDRESS  0x34 // Now defined in axp20x.h
 #define GPS_POWER_CTRL_CH 3
 #define LORA_POWER_CTRL_CH 2

src/esp32/main-esp32.cpp

@@ -3,6 +3,7 @@
 #include "PowerFSM.h"
 #include "configuration.h"
 #include "main.h"
+#include "power.h"
 #include "target_specific.h"
 
 bool bluetoothOn;
@@ -58,6 +59,13 @@ void getMacAddr(uint8_t *dmac)
 }
 
 #ifdef TBEAM_V10
+
+// FIXME. nasty hack cleanup how we load axp192
+#undef AXP192_SLAVE_ADDRESS
+#include "axp20x.h"
+AXP20X_Class axp;
+bool pmu_irq = false;
+
 /// Reads power status to powerStatus singleton.
 //
 // TODO(girts): move this and other axp stuff to power.h/power.cpp.

src/main.cpp

@@ -42,17 +42,11 @@
 #include "BluetoothUtil.h"
 #endif
 
-#ifdef TBEAM_V10
-#include "axp20x.h"
-AXP20X_Class axp;
-bool pmu_irq = false;
-#endif
-
 // We always create a screen object, but we only init it if we find the hardware
 meshtastic::Screen screen(SSD1306_ADDRESS);
 
 // Global power status singleton
-static meshtastic::PowerStatus powerStatus;
+meshtastic::PowerStatus powerStatus;
 
 bool ssd1306_found;
 bool axp192_found;
@@ -80,7 +74,7 @@ void scanI2Cdevice(void)
                 ssd1306_found = true;
                 DEBUG_MSG("ssd1306 display found\n");
             }
-#ifdef TBEAM_V10
+#ifdef AXP192_SLAVE_ADDRESS
             if (addr == AXP192_SLAVE_ADDRESS) {
                 axp192_found = true;
                 DEBUG_MSG("axp192 PMU found\n");

src/power.h

@@ -16,3 +16,5 @@ struct PowerStatus {
 };
 
 } // namespace meshtastic
+
+extern meshtastic::PowerStatus powerStatus;