From 5f41c7d6426a3f986f0dc6569394482b99d2b66c Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Mon, 24 Aug 2026 21:17:12 +0200 Subject: [PATCH] Fix for wifi toggle off not working and added device configs for wifi --- Devices/btt-panda-touch/bigtreetech,panda-touch.dts | 1 - Devices/cyd-2432s024c/cyd,2432s024c.dts | 1 - Devices/cyd-2432s024r/cyd,2432s024r.dts | 1 - Devices/cyd-2432s028r/cyd,2432s028r.dts | 1 - Devices/cyd-2432s028rv3/cyd,2432s028rv3.dts | 1 - Devices/cyd-2432s032c/cyd,2432s032c.dts | 1 - Devices/cyd-3248s035c/cyd,3248s035c.dts | 1 - Devices/cyd-4848s040c/cyd,4848s040c.dts | 1 - Devices/cyd-8048s043c/cyd,8048s043c.dts | 1 - Devices/cyd-e32r28t/cyd,e32r28t.dts | 1 - Devices/cyd-e32r32p/cyd,e32r32p.dts | 1 - .../elecrow,crowpanel-advance-28.dts | 1 - .../elecrow,crowpanel-advance-35.dts | 1 - .../elecrow,crowpanel-advance-50.dts | 1 - .../elecrow,crowpanel-basic-28.dts | 1 - .../elecrow,crowpanel-basic-35.dts | 1 - .../elecrow,crowpanel-basic-50.dts | 1 - Devices/es3c28p/es3c28p.dts | 1 - Devices/generic-esp32/generic,esp32.dts | 1 - Devices/generic-esp32c6/generic,esp32c6.dts | 1 - Devices/generic-esp32s3/generic,esp32s3.dts | 1 - Devices/guition-jc2432w328c/guition,jc2432w328c.dts | 1 - Devices/guition-jc8048w550c/guition,jc8048w550c.dts | 1 - Devices/heltec-wifi-lora-32-v3/heltec,wifi-lora-32-v3.dts | 1 - Devices/lilygo-tdeck-max/lilygo,tdeck-max.dts | 1 - Devices/lilygo-tdeck-plus/lilygo,tdeck-plus.dts | 1 - Devices/lilygo-tdeck-pro/lilygo,tdeck-pro.dts | 1 - Devices/lilygo-tdeck/lilygo,tdeck.dts | 1 - Devices/lilygo-tdisplay-s3/lilygo,tdisplay-s3.dts | 1 - Devices/lilygo-tdisplay/lilygo,tdisplay.dts | 1 - Devices/lilygo-tdongle-s3/lilygo,tdongle-s3.dts | 1 - Devices/lilygo-thmi/lilygo,thmi.dts | 1 - Devices/lilygo-tlora-pager/lilygo,tlora-pager.dts | 1 - Devices/m5stack-cardputer-adv/m5stack,cardputer-adv.dts | 1 - Devices/m5stack-cardputer/m5stack,cardputer.dts | 1 - Devices/m5stack-core2/m5stack,core2.dts | 1 - Devices/m5stack-cores3/m5stack,cores3.dts | 1 - Devices/m5stack-papers3/m5stack,papers3.dts | 1 - Devices/m5stack-stackchan/m5stack,stackchan.dts | 1 - Devices/m5stack-stickc-plus2/m5stack,stickc-plus2.dts | 1 - Devices/m5stack-sticks3/m5stack,sticks3.dts | 1 - Devices/tulip-4r11/tulip-4r11.dts | 1 - Devices/unphone/unphone.dts | 1 - Devices/waveshare-esp32-s3-geek/waveshare,esp32-s3-geek.dts | 1 - Devices/waveshare-s3-lcd-13/waveshare,s3-lcd-13.dts | 1 - .../waveshare,s3-touch-lcd-128.dts | 1 - .../waveshare,s3-touch-lcd-147.dts | 1 - .../waveshare-s3-touch-lcd-43/waveshare,s3-touch-lcd-43.dts | 1 - .../wireless-tag,wt32-sc01-plus.dts | 1 - Tactility/Source/service/wifi/Wifi.cpp | 6 ++++-- 50 files changed, 4 insertions(+), 51 deletions(-) diff --git a/Devices/btt-panda-touch/bigtreetech,panda-touch.dts b/Devices/btt-panda-touch/bigtreetech,panda-touch.dts index d106f1ce4..e6995484d 100644 --- a/Devices/btt-panda-touch/bigtreetech,panda-touch.dts +++ b/Devices/btt-panda-touch/bigtreetech,panda-touch.dts @@ -18,7 +18,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/cyd-2432s024c/cyd,2432s024c.dts b/Devices/cyd-2432s024c/cyd,2432s024c.dts index dadaf0bc6..eafea7ac4 100644 --- a/Devices/cyd-2432s024c/cyd,2432s024c.dts +++ b/Devices/cyd-2432s024c/cyd,2432s024c.dts @@ -18,7 +18,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/cyd-2432s024r/cyd,2432s024r.dts b/Devices/cyd-2432s024r/cyd,2432s024r.dts index 06f7c9741..179628783 100644 --- a/Devices/cyd-2432s024r/cyd,2432s024r.dts +++ b/Devices/cyd-2432s024r/cyd,2432s024r.dts @@ -18,7 +18,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/cyd-2432s028r/cyd,2432s028r.dts b/Devices/cyd-2432s028r/cyd,2432s028r.dts index 9aa1dcefb..443a3f42e 100644 --- a/Devices/cyd-2432s028r/cyd,2432s028r.dts +++ b/Devices/cyd-2432s028r/cyd,2432s028r.dts @@ -19,7 +19,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/cyd-2432s028rv3/cyd,2432s028rv3.dts b/Devices/cyd-2432s028rv3/cyd,2432s028rv3.dts index 2b1efc462..93aaf1731 100644 --- a/Devices/cyd-2432s028rv3/cyd,2432s028rv3.dts +++ b/Devices/cyd-2432s028rv3/cyd,2432s028rv3.dts @@ -19,7 +19,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/cyd-2432s032c/cyd,2432s032c.dts b/Devices/cyd-2432s032c/cyd,2432s032c.dts index 940b9ac50..563e73726 100644 --- a/Devices/cyd-2432s032c/cyd,2432s032c.dts +++ b/Devices/cyd-2432s032c/cyd,2432s032c.dts @@ -18,7 +18,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/cyd-3248s035c/cyd,3248s035c.dts b/Devices/cyd-3248s035c/cyd,3248s035c.dts index dd8e8647c..8718e54b3 100644 --- a/Devices/cyd-3248s035c/cyd,3248s035c.dts +++ b/Devices/cyd-3248s035c/cyd,3248s035c.dts @@ -19,7 +19,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/cyd-4848s040c/cyd,4848s040c.dts b/Devices/cyd-4848s040c/cyd,4848s040c.dts index 6a5471b2f..b8198b5a2 100644 --- a/Devices/cyd-4848s040c/cyd,4848s040c.dts +++ b/Devices/cyd-4848s040c/cyd,4848s040c.dts @@ -18,7 +18,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/cyd-8048s043c/cyd,8048s043c.dts b/Devices/cyd-8048s043c/cyd,8048s043c.dts index 71b477695..eecd8949b 100644 --- a/Devices/cyd-8048s043c/cyd,8048s043c.dts +++ b/Devices/cyd-8048s043c/cyd,8048s043c.dts @@ -19,7 +19,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/cyd-e32r28t/cyd,e32r28t.dts b/Devices/cyd-e32r28t/cyd,e32r28t.dts index e5e111e41..53457ad16 100644 --- a/Devices/cyd-e32r28t/cyd,e32r28t.dts +++ b/Devices/cyd-e32r28t/cyd,e32r28t.dts @@ -17,7 +17,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/cyd-e32r32p/cyd,e32r32p.dts b/Devices/cyd-e32r32p/cyd,e32r32p.dts index 2953bf9d3..51a8fa564 100644 --- a/Devices/cyd-e32r32p/cyd,e32r32p.dts +++ b/Devices/cyd-e32r32p/cyd,e32r32p.dts @@ -20,7 +20,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/elecrow-crowpanel-advance-28/elecrow,crowpanel-advance-28.dts b/Devices/elecrow-crowpanel-advance-28/elecrow,crowpanel-advance-28.dts index 78db1398e..919c72db3 100644 --- a/Devices/elecrow-crowpanel-advance-28/elecrow,crowpanel-advance-28.dts +++ b/Devices/elecrow-crowpanel-advance-28/elecrow,crowpanel-advance-28.dts @@ -20,7 +20,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/elecrow-crowpanel-advance-35/elecrow,crowpanel-advance-35.dts b/Devices/elecrow-crowpanel-advance-35/elecrow,crowpanel-advance-35.dts index a687b01c6..810a5209d 100644 --- a/Devices/elecrow-crowpanel-advance-35/elecrow,crowpanel-advance-35.dts +++ b/Devices/elecrow-crowpanel-advance-35/elecrow,crowpanel-advance-35.dts @@ -20,7 +20,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/elecrow-crowpanel-advance-50/elecrow,crowpanel-advance-50.dts b/Devices/elecrow-crowpanel-advance-50/elecrow,crowpanel-advance-50.dts index 1a0f93ba8..a9e168832 100644 --- a/Devices/elecrow-crowpanel-advance-50/elecrow,crowpanel-advance-50.dts +++ b/Devices/elecrow-crowpanel-advance-50/elecrow,crowpanel-advance-50.dts @@ -20,7 +20,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/elecrow-crowpanel-basic-28/elecrow,crowpanel-basic-28.dts b/Devices/elecrow-crowpanel-basic-28/elecrow,crowpanel-basic-28.dts index 5c04fcab3..77e07953a 100644 --- a/Devices/elecrow-crowpanel-basic-28/elecrow,crowpanel-basic-28.dts +++ b/Devices/elecrow-crowpanel-basic-28/elecrow,crowpanel-basic-28.dts @@ -18,7 +18,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/elecrow-crowpanel-basic-35/elecrow,crowpanel-basic-35.dts b/Devices/elecrow-crowpanel-basic-35/elecrow,crowpanel-basic-35.dts index de27790aa..f5ab1aeca 100644 --- a/Devices/elecrow-crowpanel-basic-35/elecrow,crowpanel-basic-35.dts +++ b/Devices/elecrow-crowpanel-basic-35/elecrow,crowpanel-basic-35.dts @@ -18,7 +18,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/elecrow-crowpanel-basic-50/elecrow,crowpanel-basic-50.dts b/Devices/elecrow-crowpanel-basic-50/elecrow,crowpanel-basic-50.dts index ebb9e0b84..085d8ed6c 100644 --- a/Devices/elecrow-crowpanel-basic-50/elecrow,crowpanel-basic-50.dts +++ b/Devices/elecrow-crowpanel-basic-50/elecrow,crowpanel-basic-50.dts @@ -20,7 +20,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/es3c28p/es3c28p.dts b/Devices/es3c28p/es3c28p.dts index 75d5ac1dc..6aca63899 100644 --- a/Devices/es3c28p/es3c28p.dts +++ b/Devices/es3c28p/es3c28p.dts @@ -24,7 +24,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/generic-esp32/generic,esp32.dts b/Devices/generic-esp32/generic,esp32.dts index 3e49b6c50..84fc39d4f 100644 --- a/Devices/generic-esp32/generic,esp32.dts +++ b/Devices/generic-esp32/generic,esp32.dts @@ -11,7 +11,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/generic-esp32c6/generic,esp32c6.dts b/Devices/generic-esp32c6/generic,esp32c6.dts index fef95675b..7c5254acb 100644 --- a/Devices/generic-esp32c6/generic,esp32c6.dts +++ b/Devices/generic-esp32c6/generic,esp32c6.dts @@ -11,7 +11,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/generic-esp32s3/generic,esp32s3.dts b/Devices/generic-esp32s3/generic,esp32s3.dts index 8443fcf47..eba13b006 100644 --- a/Devices/generic-esp32s3/generic,esp32s3.dts +++ b/Devices/generic-esp32s3/generic,esp32s3.dts @@ -11,7 +11,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/guition-jc2432w328c/guition,jc2432w328c.dts b/Devices/guition-jc2432w328c/guition,jc2432w328c.dts index 138df637c..3fa69997c 100644 --- a/Devices/guition-jc2432w328c/guition,jc2432w328c.dts +++ b/Devices/guition-jc2432w328c/guition,jc2432w328c.dts @@ -19,7 +19,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/guition-jc8048w550c/guition,jc8048w550c.dts b/Devices/guition-jc8048w550c/guition,jc8048w550c.dts index 3be39b67a..df755b847 100644 --- a/Devices/guition-jc8048w550c/guition,jc8048w550c.dts +++ b/Devices/guition-jc8048w550c/guition,jc8048w550c.dts @@ -21,7 +21,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/heltec-wifi-lora-32-v3/heltec,wifi-lora-32-v3.dts b/Devices/heltec-wifi-lora-32-v3/heltec,wifi-lora-32-v3.dts index db8be2bf2..9d8a983e9 100644 --- a/Devices/heltec-wifi-lora-32-v3/heltec,wifi-lora-32-v3.dts +++ b/Devices/heltec-wifi-lora-32-v3/heltec,wifi-lora-32-v3.dts @@ -18,7 +18,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/lilygo-tdeck-max/lilygo,tdeck-max.dts b/Devices/lilygo-tdeck-max/lilygo,tdeck-max.dts index d8ca0f0ab..64bd0d874 100644 --- a/Devices/lilygo-tdeck-max/lilygo,tdeck-max.dts +++ b/Devices/lilygo-tdeck-max/lilygo,tdeck-max.dts @@ -26,7 +26,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/lilygo-tdeck-plus/lilygo,tdeck-plus.dts b/Devices/lilygo-tdeck-plus/lilygo,tdeck-plus.dts index 5a0476c92..52354d01a 100644 --- a/Devices/lilygo-tdeck-plus/lilygo,tdeck-plus.dts +++ b/Devices/lilygo-tdeck-plus/lilygo,tdeck-plus.dts @@ -48,7 +48,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/lilygo-tdeck-pro/lilygo,tdeck-pro.dts b/Devices/lilygo-tdeck-pro/lilygo,tdeck-pro.dts index a8db46f48..eed3ea5d8 100644 --- a/Devices/lilygo-tdeck-pro/lilygo,tdeck-pro.dts +++ b/Devices/lilygo-tdeck-pro/lilygo,tdeck-pro.dts @@ -23,7 +23,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/lilygo-tdeck/lilygo,tdeck.dts b/Devices/lilygo-tdeck/lilygo,tdeck.dts index 9c4bd34dd..be3d027a1 100644 --- a/Devices/lilygo-tdeck/lilygo,tdeck.dts +++ b/Devices/lilygo-tdeck/lilygo,tdeck.dts @@ -46,7 +46,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/lilygo-tdisplay-s3/lilygo,tdisplay-s3.dts b/Devices/lilygo-tdisplay-s3/lilygo,tdisplay-s3.dts index 2b742a3c2..9f436f89b 100644 --- a/Devices/lilygo-tdisplay-s3/lilygo,tdisplay-s3.dts +++ b/Devices/lilygo-tdisplay-s3/lilygo,tdisplay-s3.dts @@ -19,7 +19,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/lilygo-tdisplay/lilygo,tdisplay.dts b/Devices/lilygo-tdisplay/lilygo,tdisplay.dts index 877efc869..fc8248fd4 100644 --- a/Devices/lilygo-tdisplay/lilygo,tdisplay.dts +++ b/Devices/lilygo-tdisplay/lilygo,tdisplay.dts @@ -15,7 +15,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/lilygo-tdongle-s3/lilygo,tdongle-s3.dts b/Devices/lilygo-tdongle-s3/lilygo,tdongle-s3.dts index 519bade15..2c7a7bcd6 100644 --- a/Devices/lilygo-tdongle-s3/lilygo,tdongle-s3.dts +++ b/Devices/lilygo-tdongle-s3/lilygo,tdongle-s3.dts @@ -19,7 +19,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/lilygo-thmi/lilygo,thmi.dts b/Devices/lilygo-thmi/lilygo,thmi.dts index 3811c0c6c..fe3d027ce 100644 --- a/Devices/lilygo-thmi/lilygo,thmi.dts +++ b/Devices/lilygo-thmi/lilygo,thmi.dts @@ -23,7 +23,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/lilygo-tlora-pager/lilygo,tlora-pager.dts b/Devices/lilygo-tlora-pager/lilygo,tlora-pager.dts index d42846f31..553213840 100644 --- a/Devices/lilygo-tlora-pager/lilygo,tlora-pager.dts +++ b/Devices/lilygo-tlora-pager/lilygo,tlora-pager.dts @@ -27,7 +27,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/m5stack-cardputer-adv/m5stack,cardputer-adv.dts b/Devices/m5stack-cardputer-adv/m5stack,cardputer-adv.dts index bdfa69ea2..9306ff6f6 100644 --- a/Devices/m5stack-cardputer-adv/m5stack,cardputer-adv.dts +++ b/Devices/m5stack-cardputer-adv/m5stack,cardputer-adv.dts @@ -27,7 +27,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/m5stack-cardputer/m5stack,cardputer.dts b/Devices/m5stack-cardputer/m5stack,cardputer.dts index 8af8b42e4..bf97ffe67 100644 --- a/Devices/m5stack-cardputer/m5stack,cardputer.dts +++ b/Devices/m5stack-cardputer/m5stack,cardputer.dts @@ -28,7 +28,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/m5stack-core2/m5stack,core2.dts b/Devices/m5stack-core2/m5stack,core2.dts index 499df6d1f..87ceca1eb 100644 --- a/Devices/m5stack-core2/m5stack,core2.dts +++ b/Devices/m5stack-core2/m5stack,core2.dts @@ -24,7 +24,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/m5stack-cores3/m5stack,cores3.dts b/Devices/m5stack-cores3/m5stack,cores3.dts index 130a2c41a..0b6c098ef 100644 --- a/Devices/m5stack-cores3/m5stack,cores3.dts +++ b/Devices/m5stack-cores3/m5stack,cores3.dts @@ -31,7 +31,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/m5stack-papers3/m5stack,papers3.dts b/Devices/m5stack-papers3/m5stack,papers3.dts index b2bc3ccec..b51fa9d73 100644 --- a/Devices/m5stack-papers3/m5stack,papers3.dts +++ b/Devices/m5stack-papers3/m5stack,papers3.dts @@ -23,7 +23,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/m5stack-stackchan/m5stack,stackchan.dts b/Devices/m5stack-stackchan/m5stack,stackchan.dts index 9cbb0f4f6..078d491cc 100644 --- a/Devices/m5stack-stackchan/m5stack,stackchan.dts +++ b/Devices/m5stack-stackchan/m5stack,stackchan.dts @@ -31,7 +31,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/m5stack-stickc-plus2/m5stack,stickc-plus2.dts b/Devices/m5stack-stickc-plus2/m5stack,stickc-plus2.dts index 701040f98..dff6ff412 100644 --- a/Devices/m5stack-stickc-plus2/m5stack,stickc-plus2.dts +++ b/Devices/m5stack-stickc-plus2/m5stack,stickc-plus2.dts @@ -19,7 +19,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; gpio0 { diff --git a/Devices/m5stack-sticks3/m5stack,sticks3.dts b/Devices/m5stack-sticks3/m5stack,sticks3.dts index 0011b7e3e..139d12f9e 100644 --- a/Devices/m5stack-sticks3/m5stack,sticks3.dts +++ b/Devices/m5stack-sticks3/m5stack,sticks3.dts @@ -24,7 +24,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/tulip-4r11/tulip-4r11.dts b/Devices/tulip-4r11/tulip-4r11.dts index fd206859a..2781ce45c 100644 --- a/Devices/tulip-4r11/tulip-4r11.dts +++ b/Devices/tulip-4r11/tulip-4r11.dts @@ -24,7 +24,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/unphone/unphone.dts b/Devices/unphone/unphone.dts index f0c3c3999..f98fdd8b8 100644 --- a/Devices/unphone/unphone.dts +++ b/Devices/unphone/unphone.dts @@ -22,7 +22,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/waveshare-esp32-s3-geek/waveshare,esp32-s3-geek.dts b/Devices/waveshare-esp32-s3-geek/waveshare,esp32-s3-geek.dts index b159666c5..da0a0ba5b 100644 --- a/Devices/waveshare-esp32-s3-geek/waveshare,esp32-s3-geek.dts +++ b/Devices/waveshare-esp32-s3-geek/waveshare,esp32-s3-geek.dts @@ -21,7 +21,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/waveshare-s3-lcd-13/waveshare,s3-lcd-13.dts b/Devices/waveshare-s3-lcd-13/waveshare,s3-lcd-13.dts index 388d0c20f..f59ba1bca 100644 --- a/Devices/waveshare-s3-lcd-13/waveshare,s3-lcd-13.dts +++ b/Devices/waveshare-s3-lcd-13/waveshare,s3-lcd-13.dts @@ -20,7 +20,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/waveshare-s3-touch-lcd-128/waveshare,s3-touch-lcd-128.dts b/Devices/waveshare-s3-touch-lcd-128/waveshare,s3-touch-lcd-128.dts index 09e23375a..50dc811e6 100644 --- a/Devices/waveshare-s3-touch-lcd-128/waveshare,s3-touch-lcd-128.dts +++ b/Devices/waveshare-s3-touch-lcd-128/waveshare,s3-touch-lcd-128.dts @@ -21,7 +21,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/waveshare-s3-touch-lcd-147/waveshare,s3-touch-lcd-147.dts b/Devices/waveshare-s3-touch-lcd-147/waveshare,s3-touch-lcd-147.dts index 737a9e478..32ea31df8 100644 --- a/Devices/waveshare-s3-touch-lcd-147/waveshare,s3-touch-lcd-147.dts +++ b/Devices/waveshare-s3-touch-lcd-147/waveshare,s3-touch-lcd-147.dts @@ -21,7 +21,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/waveshare-s3-touch-lcd-43/waveshare,s3-touch-lcd-43.dts b/Devices/waveshare-s3-touch-lcd-43/waveshare,s3-touch-lcd-43.dts index 3bb7edb1b..44c66423a 100644 --- a/Devices/waveshare-s3-touch-lcd-43/waveshare,s3-touch-lcd-43.dts +++ b/Devices/waveshare-s3-touch-lcd-43/waveshare,s3-touch-lcd-43.dts @@ -20,7 +20,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Devices/wireless-tag-wt32-sc01-plus/wireless-tag,wt32-sc01-plus.dts b/Devices/wireless-tag-wt32-sc01-plus/wireless-tag,wt32-sc01-plus.dts index 385683d00..0fb9663a4 100644 --- a/Devices/wireless-tag-wt32-sc01-plus/wireless-tag,wt32-sc01-plus.dts +++ b/Devices/wireless-tag-wt32-sc01-plus/wireless-tag,wt32-sc01-plus.dts @@ -20,7 +20,6 @@ wifi0 { compatible = "espressif,esp32-wifi-pinned"; - status = "disabled"; }; ble0 { diff --git a/Tactility/Source/service/wifi/Wifi.cpp b/Tactility/Source/service/wifi/Wifi.cpp index ac8989c26..2f8cc1146 100644 --- a/Tactility/Source/service/wifi/Wifi.cpp +++ b/Tactility/Source/service/wifi/Wifi.cpp @@ -262,12 +262,14 @@ bool findAutoConnectAp(settings::WifiApSettings& out) { void dispatchAutoConnect() { LOG_I(TAG, "dispatchAutoConnect()"); - if (state.pauseAutoConnect || state.externalScanPause.load()) { + if (state.pauseAutoConnect || state.externalScanPause.load() || !isRadioOn()) { // A manual disconnect() or an in-progress manual connect() has paused // auto-connect, or a caller (e.g. AutoScanPauseGuard) has externally paused it. // This is called on every SCAN_FINISHED, not just the auto-connect timer's own // scans (e.g. WifiManage re-scans on show), so it must honor the pause instead of - // reconnecting unconditionally. + // reconnecting unconditionally. The radio-off check matters because a scan that was + // already in flight can finish after the user turns the radio off. Without it, + // connect() would call dispatchSetEnabled(true) and turn the radio back on. return; } RadioState radio_state = getRadioState();