From f54505243c1f58ca4b943221594c31fa518c4276 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Tue, 6 Jan 2026 14:45:51 -1000 Subject: [PATCH] [safe_mode] Fix devices getting stuck in safe mode on LibreTiny --- esphome/components/safe_mode/safe_mode.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/esphome/components/safe_mode/safe_mode.cpp b/esphome/components/safe_mode/safe_mode.cpp index c7bd8748f5..cd07f11cc5 100644 --- a/esphome/components/safe_mode/safe_mode.cpp +++ b/esphome/components/safe_mode/safe_mode.cpp @@ -150,6 +150,16 @@ void SafeModeComponent::clean_rtc() { // remain incremented. uint32_t val = 0; this->rtc_.save(&val); +#ifdef USE_LIBRETINY + // On LibreTiny (BK72xx, RTL87xx), preferences queued during shutdown are not + // reliably persisted to flash. This was observed on TuyaMCU devices where: + // 1. Safe mode button pressed or boot loop detected -> clean_rtc() queues counter=0 + // 2. OTA completes -> safe_reboot() triggers IntervalSyncer::on_shutdown() -> sync() + // 3. After reboot, counter is NOT cleared -> device stuck in safe mode loop + // The FlashDB layer appears to fail silently when writing during shutdown. + // Sync immediately to ensure the boot counter is actually persisted. + global_preferences->sync(); +#endif } void SafeModeComponent::on_safe_shutdown() {