Merge branch 'master' into master

src/Power.cpp

@@ -84,7 +84,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
 
     /// If we see a battery voltage higher than physics allows - assume charger is pumping
     /// in power
-    virtual bool isVBUSPlug() { return getBattVoltage() > chargingVolt; }
+    virtual bool isVBUSPlug() { return getBattVoltage() > 1000 * chargingVolt; }
 
     /// Assume charging if we have a battery and external power is connected.
     /// we can't be smart enough to say 'full'?

src/gps/NMEAGPS.cpp

@@ -47,6 +47,8 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
         t.tm_mon = d.month() - 1;
         t.tm_year = d.year() - 1900;
         t.tm_isdst = false;
+        DEBUG_MSG("NMEA GPS time %d\n", t.tm_sec);
+        
         perhapsSetRTC(RTCQualityGPS, t);
 
         return true;
@@ -87,11 +89,17 @@ bool NMEAGPS::lookForLocation()
         auto loc = reader.location.value();
         latitude = toDegInt(loc.lat);
         longitude = toDegInt(loc.lng);
-        foundLocation = true;
 
-        // expect gps pos lat=37.520825, lon=-122.309162, alt=158
-        DEBUG_MSG("new NMEA GPS pos lat=%f, lon=%f, alt=%d, hdop=%g, heading=%f\n", latitude * 1e-7, longitude * 1e-7, altitude,
-                  dop * 1e-2, heading * 1e-5);
+        // Some GPSes (Air530) seem to send a zero longitude when the current fix is bogus
+        if(longitude == 0)
+            DEBUG_MSG("Ignoring bogus NMEA position\n");
+        else {
+            foundLocation = true;
+
+            // expect gps pos lat=37.520825, lon=-122.309162, alt=158
+            DEBUG_MSG("new NMEA GPS pos lat=%f, lon=%f, alt=%d, hdop=%g, heading=%f\n", latitude * 1e-7, longitude * 1e-7, altitude,
+                    dop * 1e-2, heading * 1e-5);
+        }
     }
 
     return foundLocation;

src/graphics/EInkDisplay.cpp

@@ -122,7 +122,8 @@ bool EInkDisplay::connect()
 #endif
 
 #ifdef PIN_EINK_EN
-    digitalWrite(PIN_EINK_EN, HIGH);
+    // backlight power, HIGH is backlight on, LOW is off
+    digitalWrite(PIN_EINK_EN, LOW);
     pinMode(PIN_EINK_EN, OUTPUT);
 #endif
 

src/mesh/NodeDB.cpp

@@ -7,6 +7,7 @@
 #include "CryptoEngine.h"
 #include "FSCommon.h"
 #include "GPS.h"
+#include "main.h"
 #include "MeshRadio.h"
 #include "NodeDB.h"
 #include "PacketHistory.h"
@@ -583,8 +584,14 @@ NodeInfo *NodeDB::getOrCreateNode(NodeNum n)
 /// Record an error that should be reported via analytics
 void recordCriticalError(CriticalErrorCode code, uint32_t address)
 {
+    // Print error to screen and serial port
+    String lcd = String("Critical error ") + code + "!\n";
+    screen->print(lcd.c_str());
     DEBUG_MSG("NOTE! Recording critical error %d, address=%x\n", code, address);
+    
+    // Record error to DB
     myNodeInfo.error_code = code;
     myNodeInfo.error_address = address;
     myNodeInfo.error_count++;
+
 }

src/mesh/RadioLibInterface.cpp

@@ -3,6 +3,7 @@
 #include "NodeDB.h"
 #include "SPILock.h"
 #include "mesh-pb-constants.h"
+#include "error.h"
 #include <configuration.h>
 #include <pb_decode.h>
 #include <pb_encode.h>
@@ -67,9 +68,20 @@ bool RadioLibInterface::canSendImmediately()
     bool busyTx = sendingPacket != NULL;
     bool busyRx = isReceiving && isActivelyReceiving();
 
+
     if (busyTx || busyRx) {
         if (busyTx)
             DEBUG_MSG("Can not send yet, busyTx\n");
+        // If we've been trying to send the same packet more than one minute and we haven't gotten a
+        // TX IRQ from the radio, the radio is probably broken.
+        if (busyTx && (millis() - lastTxStart > 60000)){
+            DEBUG_MSG("Hardware Failure! busyTx for more than 60s\n");
+            recordCriticalError(CriticalErrorCode_TransmitFailed);
+#ifndef NO_ESP32
+            if (busyTx && (millis() - lastTxStart > 65000)) // After 5s more, reboot
+                ESP.restart();
+#endif
+        }
         if (busyRx)
             DEBUG_MSG("Can not send yet, busyRx\n");
         return false;

src/mesh/generated/mesh.pb.h

@@ -76,7 +76,8 @@ typedef enum _CriticalErrorCode {
     CriticalErrorCode_Unspecified = 4,
     CriticalErrorCode_UBloxInitFailed = 5,
     CriticalErrorCode_NoAXP192 = 6,
-    CriticalErrorCode_InvalidRadioSetting = 7
+    CriticalErrorCode_InvalidRadioSetting = 7,
+    CriticalErrorCode_TransmitFailed = 8
 } CriticalErrorCode;
 
 typedef enum _ChannelSettings_ModemConfig {

src/nrf52/hardfault.cpp

@@ -16,8 +16,14 @@ static void printUsageErrorMsg(uint32_t cfsr)
     cfsr >>= SCB_CFSR_USGFAULTSR_Pos; // right shift to lsb
     if ((cfsr & (1 << 9)) != 0)
         FAULT_MSG("Divide by zero\n");
-    if ((cfsr & (1 << 8)) != 0)
+    else if ((cfsr & (1 << 8)) != 0)
         FAULT_MSG("Unaligned\n");
+    else if ((cfsr & (1 << 1)) != 0)
+        FAULT_MSG("Invalid state\n");
+    else if ((cfsr & (1 << 0)) != 0)
+        FAULT_MSG("Invalid instruction\n");
+    else
+        FAULT_MSG("FIXME add to printUsageErrorMsg!\n");  
 }
 
 static void printBusErrorMsg(uint32_t cfsr)
@@ -71,8 +77,9 @@ extern "C" void HardFault_Impl(uint32_t stack[])
 
     FAULT_MSG("Done with fault report - Waiting to reboot\n");
     asm volatile("bkpt #01"); // Enter the debugger if one is connected
-    while (1)
-        ;
+
+    // Don't spin, so that the debugger will let the user step to next instruction
+    // while (1) ;
 }
 
 extern "C" void HardFault_Handler(void)

src/nrf52/main-nrf52.cpp

@@ -51,7 +51,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)
 {