修复可能的卡死问题

2026-06-25 15:13:36 +08:00
parent fa89db17bb
commit ae62affeec
1 changed files with 16 additions and 13 deletions
@@ -1071,19 +1071,6 @@ void setup()
        digitalWrite(RF95_FAN_EN, LOW ^ 0);
 #endif

-#ifndef ARCH_PORTDUINO
-
-        // Initialize Wifi
-#if HAS_WIFI
-    initWifi();
-#endif
-
-#if HAS_ETHERNET
-    // Initialize Ethernet
-    initEthernet();
-#endif
-#endif
-
 #if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WEBSERVER
    // Start web server thread.
    webServerThread = new WebServerThread();
@@ -1121,6 +1108,22 @@ void setup()
    setCPUFast(false); // 80MHz is fine for our slow peripherals
 #endif

+#ifndef ARCH_PORTDUINO
+    // Force BT init before WiFi so NimBLE gets clean heap
+#if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_BLUETOOTH
+    setBluetoothEnable(true);
+#endif
+    // Initialize Wifi after PowerFSM so BT gets clean heap during init
+#if HAS_WIFI
+    initWifi();
+#endif
+
+#if HAS_ETHERNET
+    // Initialize Ethernet
+    initEthernet();
+#endif
+#endif
+
 #ifdef ARDUINO_ARCH_ESP32
    LOG_DEBUG("Free heap  : %7d bytes", ESP.getFreeHeap());
    LOG_DEBUG("Free PSRAM : %7d bytes", ESP.getFreePsram());