diff --git a/src/NodeDB.cpp b/src/NodeDB.cpp index 3791a5ae5..0d8fe6a50 100644 --- a/src/NodeDB.cpp +++ b/src/NodeDB.cpp @@ -78,6 +78,12 @@ void NodeDB::resetRadioConfig() memcpy(&channelSettings.psk, &defaultpsk, sizeof(channelSettings.psk)); strcpy(channelSettings.name, "Default"); } + + // temp hack for quicker testing + /* + radioConfig.preferences.screen_on_secs = 30; + radioConfig.preferences.wait_bluetooth_secs = 30; + */ } void NodeDB::init() diff --git a/src/sleep.cpp b/src/sleep.cpp index 0459dbe7a..ad8aa7359 100644 --- a/src/sleep.cpp +++ b/src/sleep.cpp @@ -12,9 +12,9 @@ #include #ifndef NO_ESP32 -#include "rom/rtc.h" #include "esp32/pm.h" #include "esp_pm.h" +#include "rom/rtc.h" #include #include "BluetoothUtil.h" @@ -280,9 +280,12 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r assert(esp_sleep_enable_gpio_wakeup() == ESP_OK); assert(esp_sleep_enable_timer_wakeup(sleepUsec) == ESP_OK); assert(esp_light_sleep_start() == ESP_OK); - // DEBUG_MSG("Exit light sleep b=%d, rf95=%d, pmu=%d\n", digitalRead(BUTTON_PIN), digitalRead(RF95_IRQ_GPIO), - // digitalRead(PMU_IRQ)); - return esp_sleep_get_wakeup_cause(); + + 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)); + + return cause; } #endif