Merge branch 'master' into nrf52

src/mesh/SX1262Interface.cpp

@@ -71,6 +71,11 @@ bool SX1262Interface::reconfigure()
     return ERR_NONE;
 }
 
+void INTERRUPT_ATTR SX1262Interface::disableInterrupt()
+{
+    lora.clearDio1Action();
+}
+
 void SX1262Interface::setStandby()
 {
     int err = lora.standby();

src/mesh/SX1262Interface.h

@@ -29,7 +29,7 @@ class SX1262Interface : public RadioLibInterface
     /**
      * Glue functions called from ISR land
      */
-    virtual void INTERRUPT_ATTR disableInterrupt() { lora.clearDio1Action(); }
+    virtual void disableInterrupt();
 
     /**
      * Enable a particular ISR callback glue function

src/sleep.cpp

@@ -273,7 +273,7 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
 
     esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
     if (cause == ESP_SLEEP_WAKEUP_GPIO)
-        DEBUG_MSG("Exit light sleep gpio: btn=%d, rf95=%d\n", !digitalRead(BUTTON_PIN), digitalRead(RF95_IRQ_GPIO));
+        DEBUG_MSG("Exit light sleep gpio: btn=%d\n", !digitalRead(BUTTON_PIN));
 
     return cause;
 }