wartana/WLED
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

deepsleep cleanup, use toki to check for valid time

Browse Source
This commit is contained in:
Damian Schneider
2026-01-10 12:36:07 +01:00
parent fe3a158264
commit 6e9dc181e1
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
usermods/deep_sleep/deep_sleep.cpp
View File

@@ -80,8 +80,8 @@ class DeepSleepUsermod : public Usermod {
} }
int findNextTimerInterval() { int findNextTimerInterval() {
if (localTime < 1672502400) { // time invalid before NTP sync 2023-1-1 if (toki.getTimeSource() == TOKI_TS_NONE) {
DEBUG_PRINTLN("Skipping timer check: local time not yet synchronized."); DEBUG_PRINTLN("DeepSleep: local time not yet synchronized, skipping timer check.");
return -1; return -1;
} }
int currentHour = hour(localTime); int currentHour = hour(localTime);
@@ -129,9 +129,8 @@ class DeepSleepUsermod : public Usermod {
#ifdef WLED_DEBUG #ifdef WLED_DEBUG
DEBUG_PRINTF("sleep wakeup cause: %d\n", esp_sleep_get_wakeup_cause()); DEBUG_PRINTF("sleep wakeup cause: %d\n", esp_sleep_get_wakeup_cause());
#endif #endif
if (esp_sleep_get_wakeup_cause() != ESP_SLEEP_WAKEUP_TIMER) { if (esp_sleep_get_wakeup_cause() != ESP_SLEEP_WAKEUP_TIMER)
wakeupPreset = 0; // not a timed wakeup, don't apply preset wakeupPreset = 0; // not a timed wakeup, don't apply preset
}
initDone = true; initDone = true;
} }
@@ -139,20 +138,22 @@ class DeepSleepUsermod : public Usermod {
if (!enabled) return; if (!enabled) return;
if (!offMode) { // LEDs are on if (!offMode) { // LEDs are on
lastLoopTime = 0; // reset timer lastLoopTime = 0; // reset timer
if (delaycounter) delaycounter--; // decrease delay counter if LEDs are on (they are always turned on after a wake-up, see below) if (delaycounter)
else if (wakeupPreset) applyPreset(wakeupPreset); // apply preset if set, this ensures macro is applied even if we missed the wake-up time delaycounter--; // decrease delay counter if LEDs are on (they are always turned on after a wake-up, see below)
else if (wakeupPreset)
applyPreset(wakeupPreset); // apply preset if set, this ensures macro is applied even if we missed the wake-up time
return; return;
} }
if (sleepDelay > 0) { if (sleepDelay > 0) {
powerup = false; // disable powerup sleep if delay is set powerup = false; // disable "safety" powerup sleep if delay is set
if (lastLoopTime == 0) lastLoopTime = millis(); // initialize if (lastLoopTime == 0)
if (millis() - lastLoopTime < sleepDelay * 1000) { lastLoopTime = millis(); // initialize
if (millis() - lastLoopTime < sleepDelay * 1000)
return; // wait until delay is over return; // wait until delay is over
}
} else if (powerup && delaycounter) { } else if (powerup && delaycounter) {
delaycounter--; // on first boot without sleepDelay set, do not force-turn on delaycounter--; // on first boot without sleepDelay set, do not force-turn on
delay(1000); // just in case: give user a short ~10s window to turn LEDs on in UI delay(1000); // just in case: give user a short ~10s window to turn LEDs on in UI (delaycounter is 10 by default)
return; return;
} }
if (powerup == false && delaycounter) { // delay sleep in case a preset is being loaded and turnOnAtBoot is disabled (handleIO() does enable offMode temporarily in this case) if (powerup == false && delaycounter) { // delay sleep in case a preset is being loaded and turnOnAtBoot is disabled (handleIO() does enable offMode temporarily in this case)
@@ -198,8 +199,8 @@ class DeepSleepUsermod : public Usermod {
halerror = esp_deep_sleep_enable_gpio_wakeup(1<<wakeupPin, ESP_GPIO_WAKEUP_GPIO_HIGH); halerror = esp_deep_sleep_enable_gpio_wakeup(1<<wakeupPin, ESP_GPIO_WAKEUP_GPIO_HIGH);
else else
halerror = esp_deep_sleep_enable_gpio_wakeup(1<<wakeupPin, ESP_GPIO_WAKEUP_GPIO_LOW); halerror = esp_deep_sleep_enable_gpio_wakeup(1<<wakeupPin, ESP_GPIO_WAKEUP_GPIO_LOW);
// note: on C3 calling esp_deep_sleep_enable_gpio_wakeup() automatically configures pin as RTC IO and enables pullup/pulldown unless we call gpio_hold_en() which overrides that // note: on C3 calling esp_deep_sleep_enable_gpio_wakeup() automatically enables pullup/pulldown unless we call gpio_hold_en() which overrides that
gpio_pullup_dis((gpio_num_t)wakeupPin); gpio_pullup_dis((gpio_num_t)wakeupPin); // disable pull resistors by default
gpio_pulldown_dis((gpio_num_t)wakeupPin); gpio_pulldown_dis((gpio_num_t)wakeupPin);
if (!noPull) { if (!noPull) {
if (wakeWhenHigh) { if (wakeWhenHigh) {
@@ -208,34 +209,33 @@ class DeepSleepUsermod : public Usermod {
gpio_pullup_en((gpio_num_t)wakeupPin); gpio_pullup_en((gpio_num_t)wakeupPin);
} }
} }
gpio_hold_en((gpio_num_t)wakeupPin); // if hole_en is used, pullups are disabled for some reason, lets make use of that gpio_hold_en((gpio_num_t)wakeupPin); // hold the configured GPIO state during deep sleep, overrides the automatic pullup/pulldown, see note above
#else // ESP32, S2, S3 #else // ESP32, S2, S3
rtc_gpio_hold_dis((gpio_num_t)wakeupPin); // disable hold and configure pin rtc_gpio_hold_dis((gpio_num_t)wakeupPin); // disable hold so we can (re)configure pin
rtc_gpio_init((gpio_num_t)wakeupPin); // initialize GPIO for RTC domain use rtc_gpio_init((gpio_num_t)wakeupPin); // hand the pin over to RTC module
rtc_gpio_set_direction((gpio_num_t)wakeupPin, RTC_GPIO_MODE_INPUT_ONLY); rtc_gpio_set_direction((gpio_num_t)wakeupPin, RTC_GPIO_MODE_INPUT_ONLY);
rtc_gpio_pullup_dis((gpio_num_t)wakeupPin); rtc_gpio_pullup_dis((gpio_num_t)wakeupPin); // disable pull resistors by default
rtc_gpio_pulldown_dis((gpio_num_t)wakeupPin); rtc_gpio_pulldown_dis((gpio_num_t)wakeupPin);
if (!noPull) { if (!noPull) {
if (wakeWhenHigh) { if (wakeWhenHigh)
rtc_gpio_pulldown_en((gpio_num_t)wakeupPin); rtc_gpio_pulldown_en((gpio_num_t)wakeupPin);
} else { else
rtc_gpio_pullup_en((gpio_num_t)wakeupPin); rtc_gpio_pullup_en((gpio_num_t)wakeupPin);
}
} }
if (wakeWhenHigh) if (wakeWhenHigh)
halerror = esp_sleep_enable_ext1_wakeup(1ULL << wakeupPin, ESP_EXT1_WAKEUP_ANY_HIGH); // only RTC pins can be used halerror = esp_sleep_enable_ext1_wakeup(1ULL << wakeupPin, ESP_EXT1_WAKEUP_ANY_HIGH); // use ext1 as ext0 does not work with touch wakeup
else else
halerror = esp_sleep_enable_ext1_wakeup(1ULL << wakeupPin, ESP_EXT1_WAKEUP_ALL_LOW); halerror = esp_sleep_enable_ext1_wakeup(1ULL << wakeupPin, ESP_EXT1_WAKEUP_ALL_LOW);
if (enableTouchWakeup) { if (enableTouchWakeup) {
#ifdef SOC_TOUCH_VERSION_2 // S2 and S3 use much higher thresholds #ifdef SOC_TOUCH_VERSION_2 // S2 and S3 use much higher thresholds, see notes in pin_manager
touchSleepWakeUpEnable(touchPin, touchThreshold << 4); // ESP32 S2 & S3: lower threshold = more sensitive touchSleepWakeUpEnable(touchPin, touchThreshold << 4); // ESP32 S2 & S3: lower threshold = more sensitive
#else #else
touchSleepWakeUpEnable(touchPin, touchThreshold); // ESP32: higher threshold = more sensitive touchSleepWakeUpEnable(touchPin, touchThreshold); // ESP32: use normal threshold (higher = more sensitive)
#endif #endif
} }
delay(1); // just in case: wait for pins to be ready delay(1); // wait for pins to be ready
rtc_gpio_hold_en((gpio_num_t)wakeupPin); // hold the configured GPIO state during deep sleep rtc_gpio_hold_en((gpio_num_t)wakeupPin); // latch and hold the configured GPIO state during deep sleep
#endif #endif
WiFi.mode(WIFI_OFF); // Completely shut down the Wi-Fi module WiFi.mode(WIFI_OFF); // Completely shut down the Wi-Fi module
if (halerror == ESP_OK) esp_deep_sleep_start(); // go into deep sleep if (halerror == ESP_OK) esp_deep_sleep_start(); // go into deep sleep
@@ -253,8 +253,8 @@ class DeepSleepUsermod : public Usermod {
top["wakeWhen"] = wakeWhenHigh; top["wakeWhen"] = wakeWhenHigh;
top["pull"] = noPull; top["pull"] = noPull;
#ifndef CONFIG_IDF_TARGET_ESP32C3 #ifndef CONFIG_IDF_TARGET_ESP32C3
top["enableTouchWakeup"] = enableTouchWakeup; top["enableTouchWakeup"] = enableTouchWakeup;
top["touchPin"] = touchPin; top["touchPin"] = touchPin;
#endif #endif
top["presetWake"] = presetWake; top["presetWake"] = presetWake;
top["wakeAfter"] = wakeupAfter; top["wakeAfter"] = wakeupAfter;

3
wled00/pin_manager.h
View File

@@ -69,8 +69,7 @@ enum struct PinOwner : uint8_t {
UM_LDR_DUSK_DAWN = USERMOD_ID_LDR_DUSK_DAWN, // 0x2B // Usermod "usermod_LDR_Dusk_Dawn_v2.h" UM_LDR_DUSK_DAWN = USERMOD_ID_LDR_DUSK_DAWN, // 0x2B // Usermod "usermod_LDR_Dusk_Dawn_v2.h"
UM_MAX17048 = USERMOD_ID_MAX17048, // 0x2F // Usermod "usermod_max17048.h" UM_MAX17048 = USERMOD_ID_MAX17048, // 0x2F // Usermod "usermod_max17048.h"
UM_BME68X = USERMOD_ID_BME68X, // 0x31 // Usermod "usermod_bme68x.h -- Uses "standard" HW_I2C pins UM_BME68X = USERMOD_ID_BME68X, // 0x31 // Usermod "usermod_bme68x.h -- Uses "standard" HW_I2C pins
UM_PIXELS_DICE_TRAY = USERMOD_ID_PIXELS_DICE_TRAY, // 0x35 // Usermod "pixels_dice_tray.h" -- Needs compile time specified 6 pins for display including SPI. UM_PIXELS_DICE_TRAY = USERMOD_ID_PIXELS_DICE_TRAY // 0x35 // Usermod "pixels_dice_tray.h" -- Needs compile time specified 6 pins for display including SPI.
UM_DEEP_SLEEP = USERMOD_ID_DEEP_SLEEP // 0x37 // Usermod "usermod_deep_sleep.h" -- Needs pins to control pmos, nmos, other devices
}; };
static_assert(0u == static_cast<uint8_t>(PinOwner::None), "PinOwner::None must be zero, so default array initialization works as expected"); static_assert(0u == static_cast<uint8_t>(PinOwner::None), "PinOwner::None must be zero, so default array initialization works as expected");