diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index 5d5cb59e8..a6fc69d5f 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -27,6 +27,12 @@ GPS *gps; bool GPS::setup() { + // Master power for the GPS +#ifdef PIN_GPS_EN + digitalWrite(PIN_GPS_EN, PIN_GPS_EN); + pinMode(PIN_GPS_EN, OUTPUT); +#endif + setAwake(true); // Wake GPS power before doing any init bool ok = setupGPS(); diff --git a/src/main.cpp b/src/main.cpp index 6da0d3ca0..ac20eee7b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -245,11 +245,15 @@ void setup() #else Wire.begin(); #endif - // i2c still busted on new board -#ifndef ARDUINO_NRF52840_PPR - scanI2Cdevice(); + +#ifdef PIN_LCD_RESET + // FIXME - move this someplace better + pinMode(PIN_LCD_RESET, OUTPUT); + digitalWrite(PIN_LCD_RESET, 0); #endif + scanI2Cdevice(); + // Buttons & LED buttonThread = new ButtonThread(); #ifdef LED_PIN diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index cf47cfd15..6d7a81e1b 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -138,7 +138,7 @@ bool NodeDB::resetRadioConfig() crypto->setKey(channelSettings.psk.size, channelSettings.psk.bytes); // temp hack for quicker testing - // devicestate.no_save = true; + devicestate.no_save = true; if (devicestate.no_save) { DEBUG_MSG("***** DEVELOPMENT MODE - DO NOT RELEASE *****\n"); diff --git a/src/nrf52/main-nrf52.cpp b/src/nrf52/main-nrf52.cpp index 867cdeefc..8abed8889 100644 --- a/src/nrf52/main-nrf52.cpp +++ b/src/nrf52/main-nrf52.cpp @@ -49,7 +49,7 @@ void getMacAddr(uint8_t *dmac) NRF52Bluetooth *nrf52Bluetooth; static bool bleOn = false; -static const bool enableBle = true; // Set to false for easier debugging +static const bool enableBle = false; // Set to false for easier debugging void setBluetoothEnable(bool on) { diff --git a/variants/ppr1/variant.h b/variants/ppr1/variant.h index 0e703f4eb..57b4e9c38 100644 --- a/variants/ppr1/variant.h +++ b/variants/ppr1/variant.h @@ -109,10 +109,15 @@ static const uint8_t AREF = PIN_AREF; #define PIN_GPS_RESET 29 // active high? #define PIN_GPS_PPS 28 -#define PIN_GPS_WAKE 7 // GPS_EN active high? +// #define PIN_GPS_WAKE 20 // CELL_CTRL in schematic? based on their example code +#define PIN_GPS_EN 7 // GPS_EN active high? #define PIN_VUSB_EN 21 +// LCD + +// #define PIN_LCD_RESET 23 // active high? + /* * SPI Interfaces */