From 5ecdbd0dbb4fe8b030a38d34e17a880f39c9c40c Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 1 Oct 2023 12:48:12 -0500 Subject: [PATCH] Removed non-functional deep sleep button awake functionality (user can RST instead) (#2852) * Fixed mask length * Don't want_response if we're a tracker or sensor * Fixes * Removing non-functioning deep sleep button awake --- src/modules/NodeInfoModule.cpp | 4 +++- src/platform/esp32/main-esp32.cpp | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/modules/NodeInfoModule.cpp b/src/modules/NodeInfoModule.cpp index 09819dab1..855ba9cde 100644 --- a/src/modules/NodeInfoModule.cpp +++ b/src/modules/NodeInfoModule.cpp @@ -40,7 +40,9 @@ void NodeInfoModule::sendOurNodeInfo(NodeNum dest, bool wantReplies, uint8_t cha meshtastic_MeshPacket *p = allocReply(); if (p) { // Check whether we didn't ignore it p->to = dest; - p->decoded.want_response = wantReplies; + p->decoded.want_response = (config.device.role != meshtastic_Config_DeviceConfig_Role_TRACKER && + config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) && + wantReplies; p->priority = meshtastic_MeshPacket_Priority_BACKGROUND; if (channel > 0) { LOG_DEBUG("sending ourNodeInfo to channel %d\n", channel); diff --git a/src/platform/esp32/main-esp32.cpp b/src/platform/esp32/main-esp32.cpp index d9bc57b02..524f8035f 100644 --- a/src/platform/esp32/main-esp32.cpp +++ b/src/platform/esp32/main-esp32.cpp @@ -199,18 +199,6 @@ void cpuDeepSleep(uint32_t msecToWake) // We want RTC peripherals to stay on esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON); -#ifdef BUTTON_PIN - -#if SOC_PM_SUPPORT_EXT_WAKEUP && !defined(HELTEC_WIRELESS_TRACKER) - esp_sleep_enable_ext0_wakeup((gpio_num_t)(1ULL << (config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN)), LOW); -#endif - -#ifdef BUTTON_NEED_PULLUP - gpio_pullup_en((gpio_num_t)BUTTON_PIN); -#endif - -#endif - esp_sleep_enable_timer_wakeup(msecToWake * 1000ULL); // call expects usecs esp_deep_sleep_start(); // TBD mA sleep current (battery) } \ No newline at end of file