v2.1.0: Upgrade esp-wifi-connect to 3.0; New device state machine (#1528)

* Upgrade component version * update fonts component version * Handle OTA error code * Update project version to 2.1.0 and add device state machine implementation - Upgrade esp-wifi-connect to 3.0.0, allowing reconfiguring wifi without rebooting - Introduce device state machine with state change notification in new files - Remove obsolete device state event files - Update application logic to utilize new state machine - Minor adjustments in various board implementations for state handling * fix compile errors * Refactor power saving mode implementation to use PowerSaveLevel enumeration - Updated Application class to replace SetPowerSaveMode with SetPowerSaveLevel, allowing for LOW_POWER and PERFORMANCE settings. - Modified various board implementations to align with the new power save level structure. - Ensured consistent handling of power save levels across different board files, enhancing code maintainability and clarity. * Refactor power save level checks across multiple board implementations - Updated the condition for power save level checks in various board files to ensure that the power save timer only wakes up when the level is not set to LOW_POWER. - Improved consistency in handling power save levels, enhancing code clarity and maintainability. * Refactor EnterWifiConfigMode calls in board implementations - Updated calls to EnterWifiConfigMode to use the appropriate instance reference (self or board) across multiple board files. - Improved code consistency and clarity in handling device state during WiFi configuration mode entry. * Add cellular modem event handling and improve network status updates - Introduced new network events for cellular modem operations, including detecting, registration errors, and timeouts. - Enhanced the Application class to handle different network states and update the display status accordingly. - Refactored Ml307Board to implement a callback mechanism for network events, improving modularity and responsiveness. - Updated dual_network_board and board headers to support new network event callbacks, ensuring consistent handling across board implementations. * update esp-wifi-connect version * Update WiFi configuration tool messages across multiple board implementations to clarify user actions
2026-01-13 16:57:17 +08:00 · 2025-12-09 09:24:56 +08:00 · 2025-12-09 09:24:56 +08:00 · b7db68457c
commit b7db68457c
parent 11c79a7003
131 changed files with 1986 additions and 1335 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -4,7 +4,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)

-set(PROJECT_VER "2.0.5")
+set(PROJECT_VER "2.1.0")

 # Add this line to disable the specific warning
 add_compile_options(-Wno-missing-field-initializers)
--- a/docs/custom-board.md
+++ b/docs/custom-board.md
@ -197,8 +197,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@ -33,7 +33,7 @@ set(SOURCES "audio/audio_codec.cc"
            "application.cc"
            "ota.cc"
            "settings.cc"
-            "device_state_event.cc"
+            "device_state_machine.cc"
            "assets.cc"
            "main.cc"
            )
--- a/main/application.cc
+++ b/main/application.cc
--- a/main/application.h
+++ b/main/application.h
@ -14,16 +14,23 @@
 #include "protocol.h"
 #include "ota.h"
 #include "audio_service.h"
-#include "device_state_event.h"
+#include "device_state.h"
+#include "device_state_machine.h"

-
-#define MAIN_EVENT_SCHEDULE (1 << 0)
-#define MAIN_EVENT_SEND_AUDIO (1 << 1)
-#define MAIN_EVENT_WAKE_WORD_DETECTED (1 << 2)
-#define MAIN_EVENT_VAD_CHANGE (1 << 3)
-#define MAIN_EVENT_ERROR (1 << 4)
-#define MAIN_EVENT_CHECK_NEW_VERSION_DONE (1 << 5)
-#define MAIN_EVENT_CLOCK_TICK (1 << 6)
+// Main event bits
+#define MAIN_EVENT_SCHEDULE             (1 << 0)
+#define MAIN_EVENT_SEND_AUDIO           (1 << 1)
+#define MAIN_EVENT_WAKE_WORD_DETECTED   (1 << 2)
+#define MAIN_EVENT_VAD_CHANGE           (1 << 3)
+#define MAIN_EVENT_ERROR                (1 << 4)
+#define MAIN_EVENT_ACTIVATION_DONE      (1 << 5)
+#define MAIN_EVENT_CLOCK_TICK           (1 << 6)
+#define MAIN_EVENT_NETWORK_CONNECTED    (1 << 7)
+#define MAIN_EVENT_NETWORK_DISCONNECTED (1 << 8)
+#define MAIN_EVENT_TOGGLE_CHAT          (1 << 9)
+#define MAIN_EVENT_START_LISTENING      (1 << 10)
+#define MAIN_EVENT_STOP_LISTENING       (1 << 11)
+#define MAIN_EVENT_STATE_CHANGED        (1 << 12)


 enum AecMode {
@ -38,25 +45,67 @@ public:
        static Application instance;
        return instance;
    }
-    // 删除拷贝构造函数和赋值运算符
+    // Delete copy constructor and assignment operator
    Application(const Application&) = delete;
    Application& operator=(const Application&) = delete;

-    void Start();
-    void MainEventLoop();
-    DeviceState GetDeviceState() const { return device_state_; }
+    /**
+     * Initialize the application
+     * This sets up display, audio, network callbacks, etc.
+     * Network connection starts asynchronously.
+     */
+    void Initialize();
+
+    /**
+     * Run the main event loop
+     * This function runs in the main task and never returns.
+     * It handles all events including network, state changes, and user interactions.
+     */
+    void Run();
+
+    DeviceState GetDeviceState() const { return state_machine_.GetState(); }
    bool IsVoiceDetected() const { return audio_service_.IsVoiceDetected(); }
+    
+    /**
+     * Request state transition
+     * Returns true if transition was successful
+     */
+    bool SetDeviceState(DeviceState state);
+
+    /**
+     * Schedule a callback to be executed in the main task
+     */
    void Schedule(std::function<void()> callback);
-    void SetDeviceState(DeviceState state);
+
+    /**
+     * Alert with status, message, emotion and optional sound
+     */
    void Alert(const char* status, const char* message, const char* emotion = "", const std::string_view& sound = "");
    void DismissAlert();
+
    void AbortSpeaking(AbortReason reason);
+
+    /**
+     * Toggle chat state (event-based, thread-safe)
+     * Sends MAIN_EVENT_TOGGLE_CHAT to be handled in Run()
+     */
    void ToggleChatState();
+
+    /**
+     * Start listening (event-based, thread-safe)
+     * Sends MAIN_EVENT_START_LISTENING to be handled in Run()
+     */
    void StartListening();
+
+    /**
+     * Stop listening (event-based, thread-safe)
+     * Sends MAIN_EVENT_STOP_LISTENING to be handled in Run()
+     */
    void StopListening();
+
    void Reboot();
    void WakeWordInvoke(const std::string& wake_word);
-    bool UpgradeFirmware(Ota& ota, const std::string& url = "");
+    bool UpgradeFirmware(const std::string& url, const std::string& version = "");
    bool CanEnterSleepMode();
    void SendMcpMessage(const std::string& payload);
    void SetAecMode(AecMode mode);
@ -64,6 +113,13 @@ public:
    void PlaySound(const std::string_view& sound);
    AudioService& GetAudioService() { return audio_service_; }
    
+    /**
+     * Reset protocol resources (thread-safe)
+     * Can be called from any task to release resources allocated after network connected
+     * This includes closing audio channel, resetting protocol and ota objects
+     */
+    void ResetProtocol();
+
 private:
    Application();
    ~Application();
@ -73,23 +129,42 @@ private:
    std::unique_ptr<Protocol> protocol_;
    EventGroupHandle_t event_group_ = nullptr;
    esp_timer_handle_t clock_timer_handle_ = nullptr;
-    volatile DeviceState device_state_ = kDeviceStateUnknown;
+    DeviceStateMachine state_machine_;
    ListeningMode listening_mode_ = kListeningModeAutoStop;
    AecMode aec_mode_ = kAecOff;
    std::string last_error_message_;
    AudioService audio_service_;
+    std::unique_ptr<Ota> ota_;

    bool has_server_time_ = false;
    bool aborted_ = false;
+    bool assets_version_checked_ = false;
    int clock_ticks_ = 0;
-    TaskHandle_t check_new_version_task_handle_ = nullptr;
-    TaskHandle_t main_event_loop_task_handle_ = nullptr;
+    TaskHandle_t activation_task_handle_ = nullptr;

-    void OnWakeWordDetected();
-    void CheckNewVersion(Ota& ota);
+
+    // Event handlers
+    void HandleStateChangedEvent();
+    void HandleToggleChatEvent();
+    void HandleStartListeningEvent();
+    void HandleStopListeningEvent();
+    void HandleNetworkConnectedEvent();
+    void HandleNetworkDisconnectedEvent();
+    void HandleActivationDoneEvent();
+    void HandleWakeWordDetectedEvent();
+
+    // Activation task (runs in background)
+    void ActivationTask();
+
+    // Helper methods
    void CheckAssetsVersion();
+    void CheckNewVersion();
+    void InitializeProtocol();
    void ShowActivationCode(const std::string& code, const std::string& message);
    void SetListeningMode(ListeningMode mode);
+    
+    // State change handler called by state machine
+    void OnStateChanged(DeviceState old_state, DeviceState new_state);
 };


--- a/main/boards/aipi-lite/aipi-lite.cc
+++ b/main/boards/aipi-lite/aipi-lite.cc
@ -7,7 +7,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <esp_log.h>
 #include <esp_sleep.h>
-#include <wifi_station.h>

 #include "application.h"
 #include "button.h"
@ -136,9 +135,9 @@ class AIPILite : public WifiBoard {
        boot_button_.OnClick([this]() {
            power_save_timer_->WakeUp();
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting &&
-                !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -154,7 +153,7 @@ class AIPILite : public WifiBoard {
            app.SetDeviceState(kDeviceStateWifiConfiguring);

            // 重置WiFi配置以确保进入配网模式
-            ResetWifiConfiguration();
+            EnterWifiConfigMode();
        });

        power_button_.OnClick([this]() { power_save_timer_->WakeUp(); });
@ -236,11 +235,11 @@ class AIPILite : public WifiBoard {
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/atk-dnesp32s3-box/atk_dnesp32s3_box.cc
+++ b/main/boards/atk-dnesp32s3-box/atk_dnesp32s3_box.cc
@ -8,7 +8,6 @@
 #include "led/single_led.h"
 #include "i2c_device.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <freertos/FreeRTOS.h>
@ -244,8 +243,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/atk-dnesp32s3-box0/atk_dnesp32s3_box0.cc
+++ b/main/boards/atk-dnesp32s3-box0/atk_dnesp32s3_box0.cc
@ -13,7 +13,6 @@
 #include "i2c_device.h"
 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
-#include <wifi_station.h>

 #include <driver/rtc_io.h>
 #include <esp_sleep.h>
@ -227,8 +226,9 @@ private:

        middle_button_.OnLongPress([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }

            if (app.GetDeviceState() != kDeviceStateStarting || app.GetDeviceState() == kDeviceStateWifiConfiguring) {
@ -377,11 +377,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/atk-dnesp32s3-box2-4g/atk_dnesp32s3_box2.cc
+++ b/main/boards/atk-dnesp32s3-box2-4g/atk_dnesp32s3_box2.cc
@ -13,7 +13,6 @@
 #include "i2c_device.h"
 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
-#include <wifi_station.h>

 #include <driver/rtc_io.h>
 #include <esp_sleep.h>
@ -280,9 +279,10 @@ private:

            auto& app = Application::GetInstance();
            if (self->GetNetworkType() == NetworkType::WIFI) {
-                if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
+                if (app.GetDeviceState() == kDeviceStateStarting) {
                    auto& wifi_board = static_cast<WifiBoard&>(self->GetCurrentBoard());
-                    wifi_board.ResetWifiConfiguration();
+                    wifi_board.EnterWifiConfigMode();
+                    return;
                }
            }

@ -463,11 +463,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        DualNetworkBoard::SetPowerSaveMode(enabled);
+        DualNetworkBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/atk-dnesp32s3-box2-wifi/atk_dnesp32s3_box2.cc
+++ b/main/boards/atk-dnesp32s3-box2-wifi/atk_dnesp32s3_box2.cc
@ -13,7 +13,6 @@
 #include "i2c_device.h"
 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
-#include <wifi_station.h>

 #include <driver/rtc_io.h>
 #include <esp_sleep.h>
@ -262,8 +261,9 @@ private:
            auto self = static_cast<atk_dnesp32s3_box2_wifi*>(usr_data);

            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                self->ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                self->EnterWifiConfigMode();
+                return;
            }

            if (self->power_status_ == kDeviceBatterySupply) {
@ -442,11 +442,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/atk-dnesp32s3/atk_dnesp32s3.cc
+++ b/main/boards/atk-dnesp32s3/atk_dnesp32s3.cc
@ -12,7 +12,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>

 #define TAG "atk_dnesp32s3"

@ -87,8 +86,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/atk-dnesp32s3m-wifi/atk_dnesp32s3m.cc
+++ b/main/boards/atk-dnesp32s3m-wifi/atk_dnesp32s3m.cc
@ -9,7 +9,6 @@
 #include "driver/gpio.h"
 #include "assets/lang_config.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lcd_panel_vendor.h>
@ -60,8 +59,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/atom-echos3r/atom_echos3r.cc
+++ b/main/boards/atom-echos3r/atom_echos3r.cc
@ -8,7 +8,6 @@

 #include <esp_log.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>

 #define TAG "AtomEchoS3R"

@ -57,8 +56,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/atommatrix-echo-base/atommatrix_echo_base.cc
+++ b/main/boards/atommatrix-echo-base/atommatrix_echo_base.cc
@ -7,7 +7,6 @@

 #include <esp_log.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>
 #include "led/circular_strip.h"

 #define TAG "XX+EchoBase"
@ -91,8 +90,9 @@ private:

            ESP_LOGI(TAG, "  ===>>>  face_button_.OnClick ");
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            } 
            app.ToggleChatState();
        });
--- a/main/boards/atoms3-echo-base/atoms3_echo_base.cc
+++ b/main/boards/atoms3-echo-base/atoms3_echo_base.cc
@ -9,7 +9,6 @@

 #include <esp_log.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_gc9a01.h>
@ -180,8 +179,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/atoms3r-cam-m12-echo-base/atoms3r_cam_m12_echo_base.cc
+++ b/main/boards/atoms3r-cam-m12-echo-base/atoms3r_cam_m12_echo_base.cc
@ -8,7 +8,6 @@

 #include <esp_log.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>
 #include "esp32_camera.h"

 #define TAG "AtomS3R CAM/M12 + EchoBase"
--- a/main/boards/atoms3r-echo-base/atoms3r_echo_base.cc
+++ b/main/boards/atoms3r-echo-base/atoms3r_echo_base.cc
@ -9,7 +9,6 @@

 #include <esp_log.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_gc9a01.h>
@ -258,8 +257,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/bread-compact-esp32-lcd/esp32_bread_board_lcd.cc
+++ b/main/boards/bread-compact-esp32-lcd/esp32_bread_board_lcd.cc
@ -7,7 +7,6 @@
 #include "config.h"
 #include "led/single_led.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lcd_panel_vendor.h>
@ -138,10 +137,11 @@ private:
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
            if (GetNetworkType() == NetworkType::WIFI) {
-                if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
+                if (app.GetDeviceState() == kDeviceStateStarting) {
                    // cast to WifiBoard
                    auto& wifi_board = static_cast<WifiBoard&>(GetCurrentBoard());
-                    wifi_board.ResetWifiConfiguration();
+                    wifi_board.EnterWifiConfigMode();
+                    return;
                }
            }
            gpio_set_level(BUILTIN_LED_GPIO, 1);
--- a/main/boards/bread-compact-esp32/esp32_bread_board.cc
+++ b/main/boards/bread-compact-esp32/esp32_bread_board.cc
@ -9,7 +9,6 @@
 #include "led/single_led.h"
 #include "display/oled_display.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lcd_panel_ops.h>
@ -106,10 +105,11 @@ private:
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
            if (GetNetworkType() == NetworkType::WIFI) {
-                if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
+                if (app.GetDeviceState() == kDeviceStateStarting) {
                    // cast to WifiBoard
                    auto& wifi_board = static_cast<WifiBoard&>(GetCurrentBoard());
-                    wifi_board.ResetWifiConfiguration();
+                    wifi_board.EnterWifiConfigMode();
+                    return;
                }
            }
            gpio_set_level(BUILTIN_LED_GPIO, 1);
--- a/main/boards/bread-compact-ml307/compact_ml307_board.cc
+++ b/main/boards/bread-compact-ml307/compact_ml307_board.cc
@ -14,7 +14,6 @@
 #include <driver/i2c_master.h>
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_panel_vendor.h>
-#include <wifi_station.h>

 #define TAG "CompactMl307Board"

@ -96,10 +95,11 @@ private:
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
            if (GetNetworkType() == NetworkType::WIFI) {
-                if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
+                if (app.GetDeviceState() == kDeviceStateStarting) {
                    // cast to WifiBoard
                    auto& wifi_board = static_cast<WifiBoard&>(GetCurrentBoard());
-                    wifi_board.ResetWifiConfiguration();
+                    wifi_board.EnterWifiConfigMode();
+                    return;
                }
            }
            app.ToggleChatState();
--- a/main/boards/bread-compact-wifi-lcd/compact_wifi_board_lcd.cc
+++ b/main/boards/bread-compact-wifi-lcd/compact_wifi_board_lcd.cc
@ -9,7 +9,6 @@
 #include "lamp_controller.h"
 #include "led/single_led.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lcd_panel_vendor.h>
@ -126,8 +125,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/bread-compact-wifi-s3cam/compact_wifi_board_s3cam.cc
+++ b/main/boards/bread-compact-wifi-s3cam/compact_wifi_board_s3cam.cc
@ -10,7 +10,6 @@
 #include "led/single_led.h"
 #include "esp32_camera.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lcd_panel_vendor.h>
@ -173,8 +172,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/bread-compact-wifi/compact_wifi_board.cc
+++ b/main/boards/bread-compact-wifi/compact_wifi_board.cc
@ -10,7 +10,6 @@
 #include "led/single_led.h"
 #include "assets/lang_config.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lcd_panel_ops.h>
@ -104,8 +103,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/common/afsk_demod.cc
+++ b/main/boards/common/afsk_demod.cc
@ -3,6 +3,7 @@
 #include <algorithm>
 #include "esp_log.h"
 #include "display.h"
+#include "ssid_manager.h"

 #ifndef M_PI
 #define M_PI 3.14159265358979323846
@ -13,7 +14,7 @@ namespace audio_wifi_config
    static const char *kLogTag = "AUDIO_WIFI_CONFIG";

    void ReceiveWifiCredentialsFromAudio(Application *app,
-                                        WifiConfigurationAp *wifi_ap,
+                                        WifiManager *wifi_manager,
                                        Display *display,
                                        size_t input_channels
                                    )
@ -90,13 +91,16 @@ namespace audio_wifi_config
                        continue;
                    }
                    
-                    if (wifi_ap->ConnectToWifi(wifi_ssid, wifi_password)) {
-                        wifi_ap->Save(wifi_ssid, wifi_password);  // Save WiFi credentials
-                        esp_restart();                            // Restart device to apply new WiFi configuration
-                    } else {
-                        ESP_LOGE(kLogTag, "Failed to connect to WiFi with received credentials");
-                    }
+                    // Save WiFi credentials using SsidManager
+                    auto& ssid_manager = SsidManager::GetInstance();
+                    ssid_manager.AddSsid(wifi_ssid, wifi_password);
+                    ESP_LOGI(kLogTag, "WiFi credentials saved successfully");
+                    
+                    // Exit config mode (triggers ConfigModeExit event)
+                    wifi_manager->StopConfigAp();
+                    
                    data_buffer.decoded_text.reset();  // Clear processed data
+                    return;  // Exit the function
                }
            }
            vTaskDelay(pdMS_TO_TICKS(1));  // 1ms delay
--- a/main/boards/common/afsk_demod.h
+++ b/main/boards/common/afsk_demod.h
@ -6,7 +6,7 @@
 #include <memory>
 #include <optional>
 #include <cmath>
-#include "wifi_configuration_ap.h"
+#include "wifi_manager.h"
 #include "application.h"

 // Audio signal processing constants for WiFi configuration via audio
@ -19,7 +19,7 @@ const size_t kWindowSize = 64;
 namespace audio_wifi_config
 {
    // Main function to receive WiFi credentials through audio signal
-    void ReceiveWifiCredentialsFromAudio(Application *app, WifiConfigurationAp *wifi_ap, Display *display, 
+    void ReceiveWifiCredentialsFromAudio(Application *app, WifiManager *wifi_manager, Display *display, 
                                         size_t input_channels = 1);

    /**
--- a/main/boards/common/board.h
+++ b/main/boards/common/board.h
@ -6,6 +6,7 @@
 #include <mqtt.h>
 #include <udp.h>
 #include <string>
+#include <functional>
 #include <network_interface.h>

 #include "led/led.h"
@ -13,6 +14,34 @@
 #include "camera.h"
 #include "assets.h"

+/**
+ * Network events for unified callback
+ */
+enum class NetworkEvent {
+    Scanning,              // Network is scanning (WiFi scanning, etc.)
+    Connecting,            // Network is connecting (data: SSID/network name)
+    Connected,             // Network connected successfully (data: SSID/network name)
+    Disconnected,          // Network disconnected
+    WifiConfigModeEnter,   // Entered WiFi configuration mode
+    WifiConfigModeExit,    // Exited WiFi configuration mode
+    // Cellular modem specific events
+    ModemDetecting,        // Detecting modem (baud rate, module type)
+    ModemErrorNoSim,       // No SIM card detected
+    ModemErrorRegDenied,   // Network registration denied
+    ModemErrorInitFailed,  // Modem initialization failed
+    ModemErrorTimeout      // Operation timeout
+};
+
+// Power save level enumeration
+enum class PowerSaveLevel {
+    LOW_POWER,    // Maximum power saving (lowest power consumption)
+    BALANCED,     // Medium power saving (balanced)
+    PERFORMANCE,  // No power saving (maximum power consumption / full performance)
+};
+
+// Network event callback type (event, data)
+// data contains additional info like SSID for Connecting/Connected events
+using NetworkEventCallback = std::function<void(NetworkEvent event, const std::string& data)>;

 void* create_board();
 class AudioCodec;
@ -46,10 +75,11 @@ public:
    virtual Camera* GetCamera();
    virtual NetworkInterface* GetNetwork() = 0;
    virtual void StartNetwork() = 0;
+    virtual void SetNetworkEventCallback(NetworkEventCallback callback) { (void)callback; }
    virtual const char* GetNetworkStateIcon() = 0;
    virtual bool GetBatteryLevel(int &level, bool& charging, bool& discharging);
    virtual std::string GetSystemInfoJson();
-    virtual void SetPowerSaveMode(bool enabled) = 0;
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) = 0;
    virtual std::string GetBoardJson() = 0;
    virtual std::string GetDeviceStatusJson() = 0;
 };
--- a/main/boards/common/dual_network_board.cc
+++ b/main/boards/common/dual_network_board.cc
@ -72,6 +72,11 @@ void DualNetworkBoard::StartNetwork() {
    current_board_->StartNetwork();
 }

+void DualNetworkBoard::SetNetworkEventCallback(NetworkEventCallback callback) {
+    // Forward the callback to the current board
+    current_board_->SetNetworkEventCallback(std::move(callback));
+}
+
 NetworkInterface* DualNetworkBoard::GetNetwork() {
    return current_board_->GetNetwork();
 }
@ -80,8 +85,8 @@ const char* DualNetworkBoard::GetNetworkStateIcon() {
    return current_board_->GetNetworkStateIcon();
 }

-void DualNetworkBoard::SetPowerSaveMode(bool enabled) {
-    current_board_->SetPowerSaveMode(enabled);
+void DualNetworkBoard::SetPowerSaveLevel(PowerSaveLevel level) {
+    current_board_->SetPowerSaveLevel(level);
 }

 std::string DualNetworkBoard::GetBoardJson() {   
--- a/main/boards/common/dual_network_board.h
+++ b/main/boards/common/dual_network_board.h
@ -49,9 +49,10 @@ public:
    // 重写Board接口
    virtual std::string GetBoardType() override;
    virtual void StartNetwork() override;
+    virtual void SetNetworkEventCallback(NetworkEventCallback callback) override;
    virtual NetworkInterface* GetNetwork() override;
    virtual const char* GetNetworkStateIcon() override;
-    virtual void SetPowerSaveMode(bool enabled) override;
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override;
    virtual std::string GetBoardJson() override;
    virtual std::string GetDeviceStatusJson() override;
 };
--- a/main/boards/common/ml307_board.cc
+++ b/main/boards/common/ml307_board.cc
@ -6,11 +6,19 @@

 #include <esp_log.h>
 #include <esp_timer.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
 #include <font_awesome.h>
 #include <opus_encoder.h>
+#include <utility>

 static const char *TAG = "Ml307Board";

+// Maximum retry count for modem detection
+static constexpr int MODEM_DETECT_MAX_RETRIES = 30;
+// Maximum retry count for network registration
+static constexpr int NETWORK_REG_MAX_RETRIES = 6;
+
 Ml307Board::Ml307Board(gpio_num_t tx_pin, gpio_num_t rx_pin, gpio_num_t dtr_pin) : tx_pin_(tx_pin), rx_pin_(rx_pin), dtr_pin_(dtr_pin) {
 }

@ -18,47 +26,106 @@ std::string Ml307Board::GetBoardType() {
    return "ml307";
 }

-void Ml307Board::StartNetwork() {
-    auto& application = Application::GetInstance();
-    auto display = Board::GetInstance().GetDisplay();
-    display->SetStatus(Lang::Strings::DETECTING_MODULE);
+void Ml307Board::SetNetworkEventCallback(NetworkEventCallback callback) {
+    network_event_callback_ = std::move(callback);
+}

-    while (true) {
+void Ml307Board::OnNetworkEvent(NetworkEvent event, const std::string& data) {
+    switch (event) {
+        case NetworkEvent::ModemDetecting:
+            ESP_LOGI(TAG, "Detecting modem...");
+            break;
+        case NetworkEvent::Connecting:
+            ESP_LOGI(TAG, "Registering network...");
+            break;
+        case NetworkEvent::Connected:
+            ESP_LOGI(TAG, "Network connected");
+            break;
+        case NetworkEvent::Disconnected:
+            ESP_LOGW(TAG, "Network disconnected");
+            break;
+        case NetworkEvent::ModemErrorNoSim:
+            ESP_LOGE(TAG, "No SIM card detected");
+            break;
+        case NetworkEvent::ModemErrorRegDenied:
+            ESP_LOGE(TAG, "Network registration denied");
+            break;
+        case NetworkEvent::ModemErrorInitFailed:
+            ESP_LOGE(TAG, "Modem initialization failed");
+            break;
+        case NetworkEvent::ModemErrorTimeout:
+            ESP_LOGE(TAG, "Operation timeout");
+            break;
+        default:
+            break;
+    }
+
+    // Notify external callback if set
+    if (network_event_callback_) {
+        network_event_callback_(event, data);
+    }
+}
+
+void Ml307Board::NetworkTask() {
+    auto& application = Application::GetInstance();
+
+    // Notify modem detection started
+    OnNetworkEvent(NetworkEvent::ModemDetecting);
+
+    // Try to detect modem with retry limit
+    int detect_retries = 0;
+    while (detect_retries < MODEM_DETECT_MAX_RETRIES) {
        modem_ = AtModem::Detect(tx_pin_, rx_pin_, dtr_pin_, 921600);
        if (modem_ != nullptr) {
            break;
        }
+        detect_retries++;
        vTaskDelay(pdMS_TO_TICKS(1000));
    }

+    if (modem_ == nullptr) {
+        ESP_LOGE(TAG, "Failed to detect modem after %d retries", MODEM_DETECT_MAX_RETRIES);
+        OnNetworkEvent(NetworkEvent::ModemErrorInitFailed);
+        return;
+    }
+
+    ESP_LOGI(TAG, "Modem detected successfully");
+
+    // Set up network state change callback
+    // Note: Don't call GetCarrierName() here as it sends AT command and will block ReceiveTask
    modem_->OnNetworkStateChanged([this, &application](bool network_ready) {
        if (network_ready) {
-            ESP_LOGI(TAG, "Network is ready");
+            OnNetworkEvent(NetworkEvent::Connected);
        } else {
-            ESP_LOGE(TAG, "Network is down");
-            auto device_state = application.GetDeviceState();
-            if (device_state == kDeviceStateListening || device_state == kDeviceStateSpeaking) {
-                application.Schedule([this, &application]() {
-                    application.SetDeviceState(kDeviceStateIdle);
-                });
-            }
+            OnNetworkEvent(NetworkEvent::Disconnected);
        }
    });

-    // Wait for network ready
-    display->SetStatus(Lang::Strings::REGISTERING_NETWORK);
-    while (true) {
+    // Notify network registration started
+    OnNetworkEvent(NetworkEvent::Connecting);
+
+    // Wait for network ready with retry limit
+    int reg_retries = 0;
+    while (reg_retries < NETWORK_REG_MAX_RETRIES) {
        auto result = modem_->WaitForNetworkReady();
-        if (result == NetworkStatus::ErrorInsertPin) {
-            application.Alert(Lang::Strings::ERROR, Lang::Strings::PIN_ERROR, "triangle_exclamation", Lang::Sounds::OGG_ERR_PIN);
-        } else if (result == NetworkStatus::ErrorRegistrationDenied) {
-            application.Alert(Lang::Strings::ERROR, Lang::Strings::REG_ERROR, "triangle_exclamation", Lang::Sounds::OGG_ERR_REG);
-        } else {
+        if (result == NetworkStatus::Ready) {
            break;
+        } else if (result == NetworkStatus::ErrorInsertPin) {
+            OnNetworkEvent(NetworkEvent::ModemErrorNoSim);
+        } else if (result == NetworkStatus::ErrorRegistrationDenied) {
+            OnNetworkEvent(NetworkEvent::ModemErrorRegDenied);
+        } else if (result == NetworkStatus::ErrorTimeout) {
+            OnNetworkEvent(NetworkEvent::ModemErrorTimeout);
        }
+        reg_retries++;
        vTaskDelay(pdMS_TO_TICKS(10000));
    }

+    if (!modem_->network_ready()) {
+        ESP_LOGE(TAG, "Failed to register network after %d retries", NETWORK_REG_MAX_RETRIES);
+        return;
+    }
+
    // Print the ML307 modem information
    std::string module_revision = modem_->GetModuleRevision();
    std::string imei = modem_->GetImei();
@ -68,6 +135,15 @@ void Ml307Board::StartNetwork() {
    ESP_LOGI(TAG, "ML307 ICCID: %s", iccid.c_str());
 }

+void Ml307Board::StartNetwork() {
+    // Create network initialization task and return immediately
+    xTaskCreate([](void* arg) {
+        Ml307Board* board = static_cast<Ml307Board*>(arg);
+        board->NetworkTask();
+        vTaskDelete(NULL);
+    }, "ml307_net", 4096, this, 5, NULL);
+}
+
 NetworkInterface* Ml307Board::GetNetwork() {
    return modem_.get();
 }
@ -106,8 +182,9 @@ std::string Ml307Board::GetBoardJson() {
    return board_json;
 }

-void Ml307Board::SetPowerSaveMode(bool enabled) {
-    // TODO: Implement power save mode for ML307
+void Ml307Board::SetPowerSaveLevel(PowerSaveLevel level) {
+    // TODO: Implement power save level for ML307
+    (void)level;
 }

 std::string Ml307Board::GetDeviceStatusJson() {
--- a/main/boards/common/ml307_board.h
+++ b/main/boards/common/ml307_board.h
@ -12,16 +12,25 @@ protected:
    gpio_num_t tx_pin_;
    gpio_num_t rx_pin_;
    gpio_num_t dtr_pin_;
+    NetworkEventCallback network_event_callback_;

    virtual std::string GetBoardJson() override;

+    // Internal helper to trigger network event callback
+    void OnNetworkEvent(NetworkEvent event, const std::string& data = "");
+    
+    // Network initialization task (runs in FreeRTOS task)
+    static void NetworkTaskEntry(void* arg);
+    void NetworkTask();
+
 public:
    Ml307Board(gpio_num_t tx_pin, gpio_num_t rx_pin, gpio_num_t dtr_pin = GPIO_NUM_NC);
    virtual std::string GetBoardType() override;
    virtual void StartNetwork() override;
+    virtual void SetNetworkEventCallback(NetworkEventCallback callback) override;
    virtual NetworkInterface* GetNetwork() override;
    virtual const char* GetNetworkStateIcon() override;
-    virtual void SetPowerSaveMode(bool enabled) override;
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override;
    virtual AudioCodec* GetAudioCodec() override { return nullptr; }
    virtual std::string GetDeviceStatusJson() override;
 };
--- a/main/boards/common/wifi_board.cc
+++ b/main/boards/common/wifi_board.cc
@ -10,21 +10,35 @@
 #include <freertos/task.h>
 #include <esp_network.h>
 #include <esp_log.h>
+#include <utility>

 #include <font_awesome.h>
+#include <wifi_manager.h>
 #include <wifi_station.h>
-#include <wifi_configuration_ap.h>
 #include <ssid_manager.h>
 #include "afsk_demod.h"

 static const char *TAG = "WifiBoard";

+// Connection timeout in seconds
+static constexpr int CONNECT_TIMEOUT_SEC = 60;
+
 WifiBoard::WifiBoard() {
-    Settings settings("wifi", true);
-    wifi_config_mode_ = settings.GetInt("force_ap") == 1;
-    if (wifi_config_mode_) {
-        ESP_LOGI(TAG, "force_ap is set to 1, reset to 0");
-        settings.SetInt("force_ap", 0);
+    // Create connection timeout timer
+    esp_timer_create_args_t timer_args = {
+        .callback = OnWifiConnectTimeout,
+        .arg = this,
+        .dispatch_method = ESP_TIMER_TASK,
+        .name = "wifi_connect_timer",
+        .skip_unhandled_events = true
+    };
+    esp_timer_create(&timer_args, &connect_timer_);
+}
+
+WifiBoard::~WifiBoard() {
+    if (connect_timer_) {
+        esp_timer_stop(connect_timer_);
+        esp_timer_delete(connect_timer_);
    }
 }

@ -32,87 +46,190 @@ std::string WifiBoard::GetBoardType() {
    return "wifi";
 }

-void WifiBoard::EnterWifiConfigMode() {
-    auto& application = Application::GetInstance();
-    application.SetDeviceState(kDeviceStateWifiConfiguring);
+void WifiBoard::StartNetwork() {
+    auto& wifi_manager = WifiManager::GetInstance();
    
-    auto& wifi_ap = WifiConfigurationAp::GetInstance();
-    wifi_ap.SetLanguage(Lang::CODE);
-    wifi_ap.SetSsidPrefix("Xiaozhi");
-    wifi_ap.Start();
+    // Initialize WiFi manager
+    WifiManagerConfig config;
+    config.ssid_prefix = "Xiaozhi";
+    config.language = Lang::CODE;
+    wifi_manager.Initialize(config);
    
-    // Wait 1.5 seconds to display board information
-    vTaskDelay(pdMS_TO_TICKS(1500));
+    // Set unified event callback - forward to NetworkEvent with SSID data
+    wifi_manager.SetEventCallback([this, &wifi_manager](WifiEvent event) {
+        std::string ssid = wifi_manager.GetSsid();
+        switch (event) {
+            case WifiEvent::Scanning:
+                OnNetworkEvent(NetworkEvent::Scanning);
+                break;
+            case WifiEvent::Connecting:
+                OnNetworkEvent(NetworkEvent::Connecting, ssid);
+                break;
+            case WifiEvent::Connected:
+                OnNetworkEvent(NetworkEvent::Connected, ssid);
+                break;
+            case WifiEvent::Disconnected:
+                OnNetworkEvent(NetworkEvent::Disconnected);
+                break;
+            case WifiEvent::ConfigModeEnter:
+                OnNetworkEvent(NetworkEvent::WifiConfigModeEnter);
+                break;
+            case WifiEvent::ConfigModeExit:
+                OnNetworkEvent(NetworkEvent::WifiConfigModeExit);
+                break;
+        }
+    });
    
-    // Display WiFi configuration AP SSID and web server URL
-    std::string hint = Lang::Strings::CONNECT_TO_HOTSPOT;
-    hint += wifi_ap.GetSsid();
-    hint += Lang::Strings::ACCESS_VIA_BROWSER;
-    hint += wifi_ap.GetWebServerUrl();
+    // Try to connect or enter config mode
+    TryWifiConnect();
+}

-    // Announce WiFi configuration prompt
-    application.Alert(Lang::Strings::WIFI_CONFIG_MODE, hint.c_str(), "gear", Lang::Sounds::OGG_WIFICONFIG);
+void WifiBoard::TryWifiConnect() {
+    auto& ssid_manager = SsidManager::GetInstance();
+    bool have_ssid = !ssid_manager.GetSsidList().empty();
    
-    #if CONFIG_USE_ACOUSTIC_WIFI_PROVISIONING
-    auto display = Board::GetInstance().GetDisplay();
-    auto codec = Board::GetInstance().GetAudioCodec();
-    int channel = 1;
-    if (codec) {
-        channel = codec->input_channels();
-    }
-    ESP_LOGI(TAG, "Start receiving WiFi credentials from audio, input channels: %d", channel);
-    audio_wifi_config::ReceiveWifiCredentialsFromAudio(&application, &wifi_ap, display, channel);
-    #endif
-    
-    // Wait forever until reset after configuration
-    while (true) {
-        vTaskDelay(pdMS_TO_TICKS(10000));
+    if (have_ssid) {
+        // Start connection attempt with timeout
+        ESP_LOGI(TAG, "Starting WiFi connection attempt");
+        esp_timer_start_once(connect_timer_, CONNECT_TIMEOUT_SEC * 1000000ULL);
+        WifiManager::GetInstance().StartStation();
+    } else {
+        // No SSID configured, enter config mode
+        // Wait for the board version to be shown
+        vTaskDelay(pdMS_TO_TICKS(1500));
+        StartWifiConfigMode();
    }
 }

-void WifiBoard::StartNetwork() {
-    // User can press BOOT button while starting to enter WiFi configuration mode
-    if (wifi_config_mode_) {
-        EnterWifiConfigMode();
+void WifiBoard::OnNetworkEvent(NetworkEvent event, const std::string& data) {
+    switch (event) {
+        case NetworkEvent::Scanning:
+            ESP_LOGI(TAG, "WiFi scanning");
+            break;
+        case NetworkEvent::Connecting:
+            ESP_LOGI(TAG, "WiFi connecting to %s", data.c_str());
+            break;
+        case NetworkEvent::Connected:
+            // Stop timeout timer
+            esp_timer_stop(connect_timer_);
+            in_config_mode_ = false;
+            ESP_LOGI(TAG, "Connected to WiFi: %s", data.c_str());
+            break;
+        case NetworkEvent::Disconnected:
+            ESP_LOGW(TAG, "WiFi disconnected");
+            break;
+        case NetworkEvent::WifiConfigModeEnter:
+            ESP_LOGI(TAG, "WiFi config mode entered");
+            in_config_mode_ = true;
+            break;
+        case NetworkEvent::WifiConfigModeExit:
+            ESP_LOGI(TAG, "WiFi config mode exited");
+            in_config_mode_ = false;
+            // Try to connect with the new credentials
+            TryWifiConnect();
+            break;
+        default:
+            break;
+
+    }
+    
+    // Notify external callback if set
+    if (network_event_callback_) {
+        network_event_callback_(event, data);
+    }
+}
+
+void WifiBoard::SetNetworkEventCallback(NetworkEventCallback callback) {
+    network_event_callback_ = std::move(callback);
+}
+
+void WifiBoard::OnWifiConnectTimeout(void* arg) {
+    auto* board = static_cast<WifiBoard*>(arg);
+    ESP_LOGW(TAG, "WiFi connection timeout, entering config mode");
+    
+    WifiManager::GetInstance().StopStation();
+    board->StartWifiConfigMode();
+}
+
+void WifiBoard::StartWifiConfigMode() {
+    in_config_mode_ = true;
+    auto& wifi_manager = WifiManager::GetInstance();
+    
+    // Transition to wifi configuring state
+    Application::GetInstance().SetDeviceState(kDeviceStateWifiConfiguring);
+
+    wifi_manager.StartConfigAp();
+    
+    // Show config prompt after a short delay
+    Application::GetInstance().Schedule([this, &wifi_manager]() {
+        std::string hint = Lang::Strings::CONNECT_TO_HOTSPOT;
+        hint += wifi_manager.GetApSsid();
+        hint += Lang::Strings::ACCESS_VIA_BROWSER;
+        hint += wifi_manager.GetApWebUrl();
+        
+        Application::GetInstance().Alert(Lang::Strings::WIFI_CONFIG_MODE, hint.c_str(), "gear", Lang::Sounds::OGG_WIFICONFIG);
+    });
+    
+#if CONFIG_USE_ACOUSTIC_WIFI_PROVISIONING
+    // Start acoustic provisioning task
+    auto codec = Board::GetInstance().GetAudioCodec();
+    int channel = codec ? codec->input_channels() : 1;
+    ESP_LOGI(TAG, "Starting acoustic WiFi provisioning, channels: %d", channel);
+    
+    xTaskCreate([](void* arg) {
+        auto ch = reinterpret_cast<intptr_t>(arg);
+        auto& app = Application::GetInstance();
+        auto& wifi = WifiManager::GetInstance();
+        auto disp = Board::GetInstance().GetDisplay();
+        audio_wifi_config::ReceiveWifiCredentialsFromAudio(&app, &wifi, disp, ch);
+        vTaskDelete(NULL);
+    }, "acoustic_wifi", 4096, reinterpret_cast<void*>(channel), 2, NULL);
+#endif
+}
+
+void WifiBoard::EnterWifiConfigMode() {
+    ESP_LOGI(TAG, "EnterWifiConfigMode called");
+    GetDisplay()->ShowNotification(Lang::Strings::ENTERING_WIFI_CONFIG_MODE);
+    
+    auto& app = Application::GetInstance();
+    auto state = app.GetDeviceState();
+    
+    if (state == kDeviceStateSpeaking || state == kDeviceStateListening || state == kDeviceStateIdle) {
+        // Reset protocol (close audio channel, reset protocol)
+        Application::GetInstance().ResetProtocol();
+
+        xTaskCreate([](void* arg) {
+            auto* board = static_cast<WifiBoard*>(arg);
+            
+            // Wait for 1 second to allow speaking to finish gracefully
+            vTaskDelay(pdMS_TO_TICKS(1000));
+            
+            // Stop any ongoing connection attempt
+            esp_timer_stop(board->connect_timer_);
+            WifiManager::GetInstance().StopStation();
+            
+            // Enter config mode
+            board->StartWifiConfigMode();
+            
+            vTaskDelete(NULL);
+        }, "wifi_cfg_delay", 4096, this, 2, NULL);
        return;
    }
    
-    // If no WiFi SSID is configured, enter WiFi configuration mode
-    auto& ssid_manager = SsidManager::GetInstance();
-    auto ssid_list = ssid_manager.GetSsidList();
-    if (ssid_list.empty()) {
-        wifi_config_mode_ = true;
-        EnterWifiConfigMode();
+    if (state != kDeviceStateStarting) {
+        ESP_LOGE(TAG, "EnterWifiConfigMode called but device state is not starting or speaking, device state: %d", state);
        return;
    }

-    auto& wifi_station = WifiStation::GetInstance();
-    wifi_station.OnScanBegin([this]() {
-        auto display = Board::GetInstance().GetDisplay();
-        display->ShowNotification(Lang::Strings::SCANNING_WIFI, 30000);
-    });
-    wifi_station.OnConnect([this](const std::string& ssid) {
-        auto display = Board::GetInstance().GetDisplay();
-        std::string notification = Lang::Strings::CONNECT_TO;
-        notification += ssid;
-        notification += "...";
-        display->ShowNotification(notification.c_str(), 30000);
-    });
-    wifi_station.OnConnected([this](const std::string& ssid) {
-        auto display = Board::GetInstance().GetDisplay();
-        std::string notification = Lang::Strings::CONNECTED_TO;
-        notification += ssid;
-        display->ShowNotification(notification.c_str(), 30000);
-    });
-    wifi_station.Start();
+    // Stop any ongoing connection attempt
+    esp_timer_stop(connect_timer_);
+    WifiManager::GetInstance().StopStation();
    
-    // Try to connect to WiFi, if failed, launch the WiFi configuration AP
-    if (!wifi_station.WaitForConnected(60 * 1000)) {
-        wifi_station.Stop();
-        wifi_config_mode_ = true;
-        EnterWifiConfigMode();
-        return;
-    }
+    StartWifiConfigMode();
+}
+
+bool WifiBoard::IsInWifiConfigMode() const {
+    return WifiManager::GetInstance().IsConfigMode();
 }

 NetworkInterface* WifiBoard::GetNetwork() {
@ -121,147 +238,111 @@ NetworkInterface* WifiBoard::GetNetwork() {
 }

 const char* WifiBoard::GetNetworkStateIcon() {
-    if (wifi_config_mode_) {
+    auto& wifi = WifiManager::GetInstance();
+    
+    if (wifi.IsConfigMode()) {
        return FONT_AWESOME_WIFI;
    }
-    auto& wifi_station = WifiStation::GetInstance();
-    if (!wifi_station.IsConnected()) {
+    if (!wifi.IsConnected()) {
        return FONT_AWESOME_WIFI_SLASH;
    }
-    int8_t rssi = wifi_station.GetRssi();
+    
+    int rssi = wifi.GetRssi();
    if (rssi >= -60) {
        return FONT_AWESOME_WIFI;
    } else if (rssi >= -70) {
        return FONT_AWESOME_WIFI_FAIR;
-    } else {
-        return FONT_AWESOME_WIFI_WEAK;
    }
+    return FONT_AWESOME_WIFI_WEAK;
 }

 std::string WifiBoard::GetBoardJson() {
-    // Set the board type for OTA
-    auto& wifi_station = WifiStation::GetInstance();
-    std::string board_json = R"({)";
-    board_json += R"("type":")" + std::string(BOARD_TYPE) + R"(",)";
-    board_json += R"("name":")" + std::string(BOARD_NAME) + R"(",)";
-    if (!wifi_config_mode_) {
-        board_json += R"("ssid":")" + wifi_station.GetSsid() + R"(",)";
-        board_json += R"("rssi":)" + std::to_string(wifi_station.GetRssi()) + R"(,)";
-        board_json += R"("channel":)" + std::to_string(wifi_station.GetChannel()) + R"(,)";
-        board_json += R"("ip":")" + wifi_station.GetIpAddress() + R"(",)";
+    auto& wifi = WifiManager::GetInstance();
+    std::string json = R"({"type":")" + std::string(BOARD_TYPE) + R"(",)";
+    json += R"("name":")" + std::string(BOARD_NAME) + R"(",)";
+    
+    if (!wifi.IsConfigMode()) {
+        json += R"("ssid":")" + wifi.GetSsid() + R"(",)";
+        json += R"("rssi":)" + std::to_string(wifi.GetRssi()) + R"(,)";
+        json += R"("channel":)" + std::to_string(wifi.GetChannel()) + R"(,)";
+        json += R"("ip":")" + wifi.GetIpAddress() + R"(",)";
    }
-    board_json += R"("mac":")" + SystemInfo::GetMacAddress() + R"(")";
-    board_json += R"(})";
-    return board_json;
+    
+    json += R"("mac":")" + SystemInfo::GetMacAddress() + R"("})";
+    return json;
 }

-void WifiBoard::SetPowerSaveMode(bool enabled) {
-    auto& wifi_station = WifiStation::GetInstance();
-    wifi_station.SetPowerSaveMode(enabled);
-}
-
-void WifiBoard::ResetWifiConfiguration() {
-    // Set a flag and reboot the device to enter the network configuration mode
-    {
-        Settings settings("wifi", true);
-        settings.SetInt("force_ap", 1);
+void WifiBoard::SetPowerSaveLevel(PowerSaveLevel level) {
+    WifiPowerSaveLevel wifi_level;
+    switch (level) {
+        case PowerSaveLevel::LOW_POWER:
+            wifi_level = WifiPowerSaveLevel::LOW_POWER;
+            break;
+        case PowerSaveLevel::BALANCED:
+            wifi_level = WifiPowerSaveLevel::BALANCED;
+            break;
+        case PowerSaveLevel::PERFORMANCE:
+        default:
+            wifi_level = WifiPowerSaveLevel::PERFORMANCE;
+            break;
    }
-    GetDisplay()->ShowNotification(Lang::Strings::ENTERING_WIFI_CONFIG_MODE);
-    vTaskDelay(pdMS_TO_TICKS(1000));
-    // Reboot the device
-    esp_restart();
+    WifiManager::GetInstance().SetPowerSaveLevel(wifi_level);
 }

 std::string WifiBoard::GetDeviceStatusJson() {
-    /*
-     * Return device status JSON
-     * 
-     * The returned JSON structure is as follows:
-     * {
-     *     "audio_speaker": {
-     *         "volume": 70
-     *     },
-     *     "screen": {
-     *         "brightness": 100,
-     *         "theme": "light"
-     *     },
-     *     "battery": {
-     *         "level": 50,
-     *         "charging": true
-     *     },
-     *     "network": {
-     *         "type": "wifi",
-     *         "ssid": "Xiaozhi",
-     *         "rssi": -60
-     *     },
-     *     "chip": {
-     *         "temperature": 25
-     *     }
-     * }
-     */
    auto& board = Board::GetInstance();
    auto root = cJSON_CreateObject();

    // Audio speaker
    auto audio_speaker = cJSON_CreateObject();
-    auto audio_codec = board.GetAudioCodec();
-    if (audio_codec) {
-        cJSON_AddNumberToObject(audio_speaker, "volume", audio_codec->output_volume());
+    if (auto codec = board.GetAudioCodec()) {
+        cJSON_AddNumberToObject(audio_speaker, "volume", codec->output_volume());
    }
    cJSON_AddItemToObject(root, "audio_speaker", audio_speaker);

-    // Screen brightness
-    auto backlight = board.GetBacklight();
+    // Screen
    auto screen = cJSON_CreateObject();
-    if (backlight) {
+    if (auto backlight = board.GetBacklight()) {
        cJSON_AddNumberToObject(screen, "brightness", backlight->brightness());
    }
-    auto display = board.GetDisplay();
-    if (display && display->height() > 64) { // For LCD display only
-        auto theme = display->GetTheme();
-        if (theme != nullptr) {
+    if (auto display = board.GetDisplay(); display && display->height() > 64) {
+        if (auto theme = display->GetTheme()) {
            cJSON_AddStringToObject(screen, "theme", theme->name().c_str());
        }
    }
    cJSON_AddItemToObject(root, "screen", screen);

    // Battery
-    int battery_level = 0;
-    bool charging = false;
-    bool discharging = false;
-    if (board.GetBatteryLevel(battery_level, charging, discharging)) {
-        cJSON* battery = cJSON_CreateObject();
-        cJSON_AddNumberToObject(battery, "level", battery_level);
+    int level = 0;
+    bool charging = false, discharging = false;
+    if (board.GetBatteryLevel(level, charging, discharging)) {
+        auto battery = cJSON_CreateObject();
+        cJSON_AddNumberToObject(battery, "level", level);
        cJSON_AddBoolToObject(battery, "charging", charging);
        cJSON_AddItemToObject(root, "battery", battery);
    }

    // Network
+    auto& wifi = WifiManager::GetInstance();
    auto network = cJSON_CreateObject();
-    auto& wifi_station = WifiStation::GetInstance();
    cJSON_AddStringToObject(network, "type", "wifi");
-    cJSON_AddStringToObject(network, "ssid", wifi_station.GetSsid().c_str());
-    int rssi = wifi_station.GetRssi();
-    if (rssi >= -60) {
-        cJSON_AddStringToObject(network, "signal", "strong");
-    } else if (rssi >= -70) {
-        cJSON_AddStringToObject(network, "signal", "medium");
-    } else {
-        cJSON_AddStringToObject(network, "signal", "weak");
-    }
+    cJSON_AddStringToObject(network, "ssid", wifi.GetSsid().c_str());
+    int rssi = wifi.GetRssi();
+    const char* signal = rssi >= -60 ? "strong" : (rssi >= -70 ? "medium" : "weak");
+    cJSON_AddStringToObject(network, "signal", signal);
    cJSON_AddItemToObject(root, "network", network);

-    // Chip
-    float esp32temp = 0.0f;
-    if (board.GetTemperature(esp32temp)) {
+    // Chip temperature
+    float temp = 0.0f;
+    if (board.GetTemperature(temp)) {
        auto chip = cJSON_CreateObject();
-        cJSON_AddNumberToObject(chip, "temperature", esp32temp);
+        cJSON_AddNumberToObject(chip, "temperature", temp);
        cJSON_AddItemToObject(root, "chip", chip);
    }

-    auto json_str = cJSON_PrintUnformatted(root);
-    std::string json(json_str);
-    cJSON_free(json_str);
+    auto str = cJSON_PrintUnformatted(root);
+    std::string result(str);
+    cJSON_free(str);
    cJSON_Delete(root);
-    return json;
+    return result;
 }
--- a/main/boards/common/wifi_board.h
+++ b/main/boards/common/wifi_board.h
@ -2,23 +2,68 @@
 #define WIFI_BOARD_H

 #include "board.h"
+#include <freertos/FreeRTOS.h>
+#include <freertos/event_groups.h>
+#include <esp_timer.h>

 class WifiBoard : public Board {
 protected:
-    bool wifi_config_mode_ = false;
-    void EnterWifiConfigMode();
+    esp_timer_handle_t connect_timer_ = nullptr;
+    bool in_config_mode_ = false;
+    NetworkEventCallback network_event_callback_ = nullptr;
+
    virtual std::string GetBoardJson() override;

+    /**
+     * Handle network event (called from WiFi manager callbacks)
+     * @param event The network event type
+     * @param data Additional data (e.g., SSID for Connecting/Connected events)
+     */
+    void OnNetworkEvent(NetworkEvent event, const std::string& data = "");
+
+    /**
+     * Start WiFi connection attempt
+     */
+    void TryWifiConnect();
+
+    /**
+     * Enter WiFi configuration mode
+     */
+    void StartWifiConfigMode();
+
+    /**
+     * WiFi connection timeout callback
+     */
+    static void OnWifiConnectTimeout(void* arg);
+
 public:
    WifiBoard();
+    virtual ~WifiBoard();
+    
    virtual std::string GetBoardType() override;
+    
+    /**
+     * Start network connection asynchronously
+     * This function returns immediately. Network events are notified through the callback set by SetNetworkEventCallback().
+     */
    virtual void StartNetwork() override;
+    
    virtual NetworkInterface* GetNetwork() override;
+    virtual void SetNetworkEventCallback(NetworkEventCallback callback) override;
    virtual const char* GetNetworkStateIcon() override;
-    virtual void SetPowerSaveMode(bool enabled) override;
-    virtual void ResetWifiConfiguration();
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override;
    virtual AudioCodec* GetAudioCodec() override { return nullptr; }
    virtual std::string GetDeviceStatusJson() override;
+    
+    /**
+     * Enter WiFi configuration mode (thread-safe, can be called from any task)
+     */
+    void EnterWifiConfigMode();
+    
+    /**
+     * Check if in WiFi config mode
+     */
+    bool IsInWifiConfigMode() const;
 };

 #endif // WIFI_BOARD_H
--- a/main/boards/df-k10/df_k10_board.cc
+++ b/main/boards/df-k10/df_k10_board.cc
@ -15,7 +15,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>

 #include "esp_io_expander_tca95xx_16bit.h"

@ -119,8 +118,9 @@ private:
        iot_button_register_cb(btn_a, BUTTON_SINGLE_CLICK, nullptr, [](void* button_handle, void* usr_data) {
            auto self = static_cast<Df_K10Board*>(usr_data);
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                self->ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                self->EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        }, this);
@ -149,8 +149,9 @@ private:
        iot_button_register_cb(btn_b, BUTTON_SINGLE_CLICK, nullptr, [](void* button_handle, void* usr_data) {
            auto self = static_cast<Df_K10Board*>(usr_data);
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                self->ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                self->EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        }, this);
--- a/main/boards/df-s3-ai-cam/df_s3_ai_cam.cc
+++ b/main/boards/df-s3-ai-cam/df_s3_ai_cam.cc
@ -7,7 +7,6 @@
 #include "esp32_camera.h"

 #include "led/gpio_led.h"
-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <driver/gpio.h>
@ -22,8 +21,9 @@ class DfrobotEsp32S3AiCam : public WifiBoard {
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/doit-s3-aibox/doit_s3_aibox.cc
+++ b/main/boards/doit-s3-aibox/doit_s3_aibox.cc
@ -5,7 +5,6 @@
 #include "button.h"
 #include "config.h"
 #include "led/gpio_led.h"
-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <driver/gpio.h>
@ -36,8 +35,9 @@ private:
                check_time = 0;
            }
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -46,13 +46,13 @@ private:
            ESP_LOGI(TAG, "DoubleClick times %d", click_times);
            if(click_times==3) {
                click_times = 0;
-                ResetWifiConfiguration();
+                EnterWifiConfigMode();
            }
        });

        boot_button_.OnLongPress([this]() {
            if(click_times>=3) {
-                ResetWifiConfiguration();
+                EnterWifiConfigMode();
            } else {
                click_times = 0;
                check_time = 0;
--- a/main/boards/du-chatx/du-chatx-wifi.cc
+++ b/main/boards/du-chatx/du-chatx-wifi.cc
@ -9,7 +9,6 @@
 #include "power_manager.h"
 #include "power_save_timer.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lcd_panel_vendor.h>
@ -105,8 +104,9 @@ private:
        boot_button_.OnClick([this]() {
            power_save_timer_->WakeUp();
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState(); 
        });
@ -153,11 +153,11 @@ public:
        level = power_manager_->GetBatteryLevel();
        return true;
    }
-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/echoear/EchoEar.cc
+++ b/main/boards/echoear/EchoEar.cc
@ -7,7 +7,6 @@
 #include "config.h"
 #include "backlight.h"

-#include <wifi_station.h>
 #include <esp_log.h>

 #include <driver/i2c_master.h>
@ -475,9 +474,8 @@ private:
                auto touch_event = touchpad->CheckTouchEvent();

                if (touch_event == Cst816s::TOUCH_RELEASE) {
-                    if (app.GetDeviceState() == kDeviceStateStarting &&
-                            !WifiStation::GetInstance().IsConnected()) {
-                        board.ResetWifiConfiguration();
+                    if (app.GetDeviceState() == kDeviceStateStarting) {
+                        board.EnterWifiConfigMode();
                    } else {
                        app.ToggleChatState();
                    }
@ -567,9 +565,10 @@ private:
    {
        boot_button_.OnClick([this]() {
            auto &app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
+            if (app.GetDeviceState() == kDeviceStateStarting) {
                ESP_LOGI(TAG, "Boot button pressed, enter WiFi configuration mode");
-                ResetWifiConfiguration();
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/electron-bot/electron_bot.cc
+++ b/main/boards/electron-bot/electron_bot.cc
@ -5,7 +5,6 @@
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_panel_vendor.h>
 #include <esp_log.h>
-#include <wifi_station.h>

 #include "application.h"
 #include "codecs/no_audio_codec.h"
@ -76,9 +75,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting &&
-                !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/esp-box-3/esp_box3_board.cc
+++ b/main/boards/esp-box-3/esp_box3_board.cc
@ -12,7 +12,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>

 #define TAG "EspBox3Board"

@ -74,8 +73,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/esp-box-lite/esp_box_lite_board.cc
+++ b/main/boards/esp-box-lite/esp_box_lite_board.cc
@ -12,7 +12,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>

 #define TAG "EspBoxBoardLite"

@ -98,9 +97,10 @@ private:
    
    void TogleState() {
        auto& app = Application::GetInstance();
-        if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-            ResetWifiConfiguration();
-        }
+        if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
+            }
        app.ToggleChatState();        
    }

--- a/main/boards/esp-box/esp_box_board.cc
+++ b/main/boards/esp-box/esp_box_board.cc
@ -10,7 +10,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>

 #define TAG "EspBoxBoard"

@ -72,8 +71,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/esp-hi/esp_hi.cc
+++ b/main/boards/esp-hi/esp_hi.cc
@ -4,7 +4,6 @@
 #include "button.h"
 #include "config.h"
 #include "mcp_server.h"
-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
@ -23,7 +22,7 @@
 #include "servo_dog_ctrl.h"
 #include "led_strip.h"
 #include "driver/rmt_tx.h"
-#include "device_state_event.h"
+#include "device_state.h"

 #include "sdkconfig.h"

@ -171,8 +170,10 @@ private:

        boot_button_.OnClick([this]() {
            auto &app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/esp-p4-function-ev-board/esp-p4-function-ev-board.cc
+++ b/main/boards/esp-p4-function-ev-board/esp-p4-function-ev-board.cc
@ -12,7 +12,6 @@
 #include "config.h"
 #include "esp32_camera.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <inttypes.h>
 #include <driver/i2c_master.h>
@ -81,10 +80,12 @@ private:
        boot_button_.OnClick([this]()
                             {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
-            app.ToggleChatState(); });
+            app.ToggleChatState();
+        });
    }

    void InitializeTouch()
--- a/main/boards/esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc
+++ b/main/boards/esp-s3-lcd-ev-board-2/esp-s3-lcd-ev-board-2.cc
@ -8,7 +8,6 @@

 #include "config.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include "esp_lcd_gc9503.h"
@ -153,8 +152,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });
        boot_button_.OnPressDown([this]() {
--- a/main/boards/esp-s3-lcd-ev-board/esp-s3-lcd-ev-board.cc
+++ b/main/boards/esp-s3-lcd-ev-board/esp-s3-lcd-ev-board.cc
@ -8,7 +8,6 @@

 #include "config.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include "esp_lcd_gc9503.h"
@ -153,8 +152,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });
        boot_button_.OnPressDown([this]() {
--- a/main/boards/esp-sparkbot/esp_sparkbot_board.cc
+++ b/main/boards/esp-sparkbot/esp_sparkbot_board.cc
@ -7,7 +7,6 @@
 #include "mcp_server.h"
 #include "settings.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
@ -80,8 +79,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/esp-spot/esp_spot_board.cc
+++ b/main/boards/esp-spot/esp_spot_board.cc
@ -17,7 +17,6 @@
 #include "config.h"
 #include "sleep_timer.h"
 #include "wifi_board.h"
-#include "wifi_station.h"

 #ifdef IMU_INT_GPIO
 #include <esp_sleep.h>
@ -217,7 +216,7 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            HandleUserActivity();
-            ResetWifiConfiguration();
+            EnterWifiConfigMode();
        });

        key_button_.OnClick([this]() {
@ -394,11 +393,11 @@ public:
        return &audio_codec;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
        if (sleep_timer_) {
-            sleep_timer_->SetEnabled(enabled);
+            sleep_timer_->SetEnabled(level == PowerSaveLevel::LOW_POWER);
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }

    virtual bool GetBatteryLevel(int& level, bool& charging, bool& discharging) override {
--- a/main/boards/esp32-cgc-144/esp32_cgc_144_board.cc
+++ b/main/boards/esp32-cgc-144/esp32_cgc_144_board.cc
@ -11,7 +11,6 @@
 #include "led/single_led.h"
 #include "assets/lang_config.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
 #include <esp_lcd_panel_io.h>
@ -124,8 +123,9 @@ void InitializePowerManager() {
        boot_button_.OnClick([this]() {
            power_save_timer_->WakeUp();
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -181,11 +181,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/esp32-cgc/esp32_cgc_board.cc
+++ b/main/boards/esp32-cgc/esp32_cgc_board.cc
@ -9,7 +9,6 @@
 #include "lamp_controller.h"
 #include "led/single_led.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lcd_panel_vendor.h>
@ -127,8 +126,9 @@ private:
        
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc
+++ b/main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc
@ -11,7 +11,6 @@
 #include "power_save_timer.h"
 #include "axp2101.h"
 #include "i2c_device.h"
-#include <wifi_station.h>

 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
@ -189,8 +188,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -274,10 +274,10 @@ private:
    void InitializeTools() {
        auto &mcp_server = McpServer::GetInstance();
        mcp_server.AddTool("self.system.reconfigure_wifi",
-            "Reboot the device and enter WiFi configuration mode.\n"
+            "End this conversation and enter WiFi configuration mode.\n"
            "**CAUTION** You must ask the user to confirm this action.",
            PropertyList(), [this](const PropertyList& properties) {
-                ResetWifiConfiguration();
+                EnterWifiConfigMode();
                return true;
            });
    }
@ -324,11 +324,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/esp32-s3-touch-lcd-1.46/esp32-s3-touch-lcd-1.46.cc
+++ b/main/boards/esp32-s3-touch-lcd-1.46/esp32-s3-touch-lcd-1.46.cc
@ -10,7 +10,6 @@
 #include "i2c_device.h"
 #include <driver/i2c_master.h>
 #include <driver/ledc.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_spd2010.h>
@ -169,8 +168,9 @@ private:
        iot_button_register_cb(boot_btn, BUTTON_SINGLE_CLICK, nullptr, [](void* button_handle, void* usr_data) {
            auto self = static_cast<CustomBoard*>(usr_data);
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                self->ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                self->EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        }, this);
--- a/main/boards/esp32-s3-touch-lcd-1.85/esp32-s3-touch-lcd-1.85.cc
+++ b/main/boards/esp32-s3-touch-lcd-1.85/esp32-s3-touch-lcd-1.85.cc
@ -10,7 +10,6 @@
 #include "i2c_device.h"
 #include <driver/i2c_master.h>
 #include <driver/ledc.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_st77916.h>
@ -385,8 +384,9 @@ private:
        iot_button_register_cb(boot_btn, BUTTON_SINGLE_CLICK, nullptr, [](void* button_handle, void* usr_data) {
            auto self = static_cast<CustomBoard*>(usr_data);
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                self->ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                self->EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        }, this);
--- a/main/boards/esp32-s3-touch-lcd-1.85c/esp32-s3-touch-lcd-1.85c.cc
+++ b/main/boards/esp32-s3-touch-lcd-1.85c/esp32-s3-touch-lcd-1.85c.cc
@ -10,7 +10,6 @@
 #include "i2c_device.h"
 #include <driver/i2c_master.h>
 #include <driver/ledc.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_st77916.h>
@ -358,8 +357,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/esp32-s3-touch-lcd-3.5/esp32-s3-touch-lcd-3.5.cc
+++ b/main/boards/esp32-s3-touch-lcd-3.5/esp32-s3-touch-lcd-3.5.cc
@ -11,7 +11,6 @@
 #include "i2c_device.h"
 #include <driver/i2c_master.h>
 #include <driver/ledc.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_vendor.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
@ -290,8 +289,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -301,10 +301,10 @@ private:
    void InitializeTools() {
        auto &mcp_server = McpServer::GetInstance();
        mcp_server.AddTool("self.system.reconfigure_wifi",
-            "Reboot the device and enter WiFi configuration mode.\n"
+            "End this conversation and enter WiFi configuration mode.\n"
            "**CAUTION** You must ask the user to confirm this action.",
            PropertyList(), [this](const PropertyList& properties) {
-                ResetWifiConfiguration();
+                EnterWifiConfigMode();
                return true;
            });
    }
@ -358,11 +358,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }

    virtual Camera* GetCamera() override {
--- a/main/boards/esp32s3-korvo2-v3/esp32s3_korvo2_v3_board.cc
+++ b/main/boards/esp32s3-korvo2-v3/esp32s3_korvo2_v3_board.cc
@ -13,7 +13,6 @@
 #include <esp_lcd_ili9341.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>
 #include "esp32_camera.h"

 #define TAG "esp32s3_korvo2_v3"
@ -241,8 +240,9 @@ private:
        boot_button_.OnClick([this]() {});
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/genjutech-s3-1.54tft/genjutech-s3-1.54tft.cc
+++ b/main/boards/genjutech-s3-1.54tft/genjutech-s3-1.54tft.cc
@ -10,7 +10,6 @@
 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>
 #include <esp_efuse_table.h>
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
@ -109,8 +108,9 @@ private:
        boot_button_.OnClick([this]() {
            power_save_timer_->WakeUp();
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -248,11 +248,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/hu-087/hu_087_board.cc
+++ b/main/boards/hu-087/hu_087_board.cc
@ -2,7 +2,6 @@
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_panel_vendor.h>
 #include <esp_log.h>
-#include <wifi_station.h>

 #include "application.h"
 #include "assets/lang_config.h"
@ -19,134 +18,134 @@
 #define TAG "Hu087Board"

 class Hu087Board : public WifiBoard {
- private:
-  i2c_master_bus_handle_t display_i2c_bus_;
-  esp_lcd_panel_io_handle_t panel_io_ = nullptr;
-  esp_lcd_panel_handle_t panel_ = nullptr;
-  Display* display_ = nullptr;
-  Button touch_button_;
+    private:
+    i2c_master_bus_handle_t display_i2c_bus_;
+    esp_lcd_panel_io_handle_t panel_io_ = nullptr;
+    esp_lcd_panel_handle_t panel_ = nullptr;
+    Display* display_ = nullptr;
+    Button touch_button_;

-  void InitializeDisplayI2c() {
-    i2c_master_bus_config_t bus_config = {
-        .i2c_port = (i2c_port_t)0,
-        .sda_io_num = DISPLAY_SDA_PIN,
-        .scl_io_num = DISPLAY_SCL_PIN,
-        .clk_source = I2C_CLK_SRC_DEFAULT,
-        .glitch_ignore_cnt = 7,
-        .intr_priority = 0,
-        .trans_queue_depth = 0,
-        .flags =
-            {
-                .enable_internal_pullup = 1,
-            },
-    };
-    ESP_ERROR_CHECK(i2c_new_master_bus(&bus_config, &display_i2c_bus_));
-  }
-
-  void InitializeSsd1306Display() {
-    // SSD1306 config
-    esp_lcd_panel_io_i2c_config_t io_config = {
-        .dev_addr = 0x3C,
-        .on_color_trans_done = nullptr,
-        .user_ctx = nullptr,
-        .control_phase_bytes = 1,
-        .dc_bit_offset = 6,
-        .lcd_cmd_bits = 8,
-        .lcd_param_bits = 8,
-        .flags =
-            {
-                .dc_low_on_data = 0,
-                .disable_control_phase = 0,
-            },
-        .scl_speed_hz = 400 * 1000,
-    };
-
-    ESP_ERROR_CHECK(
-        esp_lcd_new_panel_io_i2c_v2(display_i2c_bus_, &io_config, &panel_io_));
-
-    ESP_LOGI(TAG, "Install SSD1306 driver");
-    esp_lcd_panel_dev_config_t panel_config = {};
-    panel_config.reset_gpio_num = -1;
-    panel_config.bits_per_pixel = 1;
-
-    esp_lcd_panel_ssd1306_config_t ssd1306_config = {
-        .height = static_cast<uint8_t>(DISPLAY_HEIGHT),
-    };
-    panel_config.vendor_config = &ssd1306_config;
-
-    ESP_ERROR_CHECK(
-        esp_lcd_new_panel_ssd1306(panel_io_, &panel_config, &panel_));
-    ESP_LOGI(TAG, "SSD1306 driver installed");
-
-    // Reset the display
-    ESP_ERROR_CHECK(esp_lcd_panel_reset(panel_));
-    if (esp_lcd_panel_init(panel_) != ESP_OK) {
-      ESP_LOGE(TAG, "Failed to initialize display");
-      display_ = new NoDisplay();
-      return;
+    void InitializeDisplayI2c() {
+        i2c_master_bus_config_t bus_config = {
+            .i2c_port = (i2c_port_t)0,
+            .sda_io_num = DISPLAY_SDA_PIN,
+            .scl_io_num = DISPLAY_SCL_PIN,
+            .clk_source = I2C_CLK_SRC_DEFAULT,
+            .glitch_ignore_cnt = 7,
+            .intr_priority = 0,
+            .trans_queue_depth = 0,
+            .flags =
+                {
+                    .enable_internal_pullup = 1,
+                },
+        };
+        ESP_ERROR_CHECK(i2c_new_master_bus(&bus_config, &display_i2c_bus_));
    }

-    // Set the display to on
-    ESP_LOGI(TAG, "Turning display on");
-    ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel_, true));
+    void InitializeSsd1306Display() {
+        // SSD1306 config
+        esp_lcd_panel_io_i2c_config_t io_config = {
+            .dev_addr = 0x3C,
+            .on_color_trans_done = nullptr,
+            .user_ctx = nullptr,
+            .control_phase_bytes = 1,
+            .dc_bit_offset = 6,
+            .lcd_cmd_bits = 8,
+            .lcd_param_bits = 8,
+            .flags =
+                {
+                    .dc_low_on_data = 0,
+                    .disable_control_phase = 0,
+                },
+            .scl_speed_hz = 400 * 1000,
+        };

-    display_ = new OledDisplay(panel_io_, panel_, DISPLAY_WIDTH, DISPLAY_HEIGHT,
-                               DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
-  }
+        ESP_ERROR_CHECK(
+            esp_lcd_new_panel_io_i2c_v2(display_i2c_bus_, &io_config, &panel_io_));

-  void initializeAmpCtrl() {
-    gpio_config_t io_conf = {
-        .pin_bit_mask = (1ULL << AUDIO_I2S_SPK_GPIO_CTLR),  // Select GPIO 2
-        .mode = GPIO_MODE_OUTPUT,                           // Set as output
-        .pull_up_en = GPIO_PULLUP_ENABLE,                   // Disable pull-up
-        .pull_down_en = GPIO_PULLDOWN_DISABLE,              // Disable pull-down
-        .intr_type = GPIO_INTR_DISABLE  // Disable interrupts
+        ESP_LOGI(TAG, "Install SSD1306 driver");
+        esp_lcd_panel_dev_config_t panel_config = {};
+        panel_config.reset_gpio_num = -1;
+        panel_config.bits_per_pixel = 1;
+
+        esp_lcd_panel_ssd1306_config_t ssd1306_config = {
+            .height = static_cast<uint8_t>(DISPLAY_HEIGHT),
+        };
+        panel_config.vendor_config = &ssd1306_config;
+
+        ESP_ERROR_CHECK(
+            esp_lcd_new_panel_ssd1306(panel_io_, &panel_config, &panel_));
+        ESP_LOGI(TAG, "SSD1306 driver installed");
+
+        // Reset the display
+        ESP_ERROR_CHECK(esp_lcd_panel_reset(panel_));
+        if (esp_lcd_panel_init(panel_) != ESP_OK) {
+            ESP_LOGE(TAG, "Failed to initialize display");
+            display_ = new NoDisplay();
+            return;
+        }
+
+        // Set the display to on
+        ESP_LOGI(TAG, "Turning display on");
+        ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel_, true));
+
+        display_ = new OledDisplay(panel_io_, panel_, DISPLAY_WIDTH, DISPLAY_HEIGHT,
+                                   DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
+    }
+
+    void initializeAmpCtrl() {
+        gpio_config_t io_conf = {
+            .pin_bit_mask = (1ULL << AUDIO_I2S_SPK_GPIO_CTLR),  // Select GPIO 2
+            .mode = GPIO_MODE_OUTPUT,                           // Set as output
+            .pull_up_en = GPIO_PULLUP_ENABLE,                   // Disable pull-up
+            .pull_down_en = GPIO_PULLDOWN_DISABLE,              // Disable pull-down
+            .intr_type = GPIO_INTR_DISABLE  // Disable interrupts
+        };
+        gpio_config(&io_conf);
+        gpio_set_level(AUDIO_I2S_SPK_GPIO_CTLR, 1);
    };
-    gpio_config(&io_conf);
-    gpio_set_level(AUDIO_I2S_SPK_GPIO_CTLR, 1);
-  };

-  void InitializeButtons() {
-    touch_button_.OnClick([this]() {
-      auto& app = Application::GetInstance();
-      if (app.GetDeviceState() == kDeviceStateStarting &&
-          !WifiStation::GetInstance().IsConnected()) {
-        ResetWifiConfiguration();
-      }
-      app.ToggleChatState();
-    });
+    void InitializeButtons() {
+        touch_button_.OnClick([this]() {
+            auto& app = Application::GetInstance();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
+            }
+            app.ToggleChatState();
+        });

-    touch_button_.OnLongPress([this]() {
-      auto codec = GetAudioCodec();
-      auto volume = codec->output_volume() + 10;
-      if (volume > 100) {
-        volume = 100;
-      }  // Need to implement logic to lower volume
-      codec->SetOutputVolume(volume);
-      GetDisplay()->ShowNotification(Lang::Strings::VOLUME +
-                                     std::to_string(volume));
-    });
-  }
+        touch_button_.OnLongPress([this]() {
+            auto codec = GetAudioCodec();
+            auto volume = codec->output_volume() + 10;
+            if (volume > 100) {
+                volume = 100;
+            }  // Need to implement logic to lower volume
+            codec->SetOutputVolume(volume);
+            GetDisplay()->ShowNotification(Lang::Strings::VOLUME +
+                                           std::to_string(volume));
+        });
+    }

 public:
-  Hu087Board() : touch_button_(TOUCH_BUTTON_GPIO) {
-    InitializeDisplayI2c();
-    InitializeSsd1306Display();
-    InitializeButtons();
-    initializeAmpCtrl();  // Could control the amp ctrl pin throught voice
-                          // detection i guess
-  }
+    Hu087Board() : touch_button_(TOUCH_BUTTON_GPIO) {
+        InitializeDisplayI2c();
+        InitializeSsd1306Display();
+        InitializeButtons();
+        initializeAmpCtrl();  // Could control the amp ctrl pin throught voice
+                              // detection i guess
+    }

-  virtual AudioCodec* GetAudioCodec() override {
-    static NoAudioCodecSimplex audio_codec(
-        AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE,
-        AUDIO_I2S_SPK_GPIO_BCLK, AUDIO_I2S_SPK_GPIO_LRCK,
-        AUDIO_I2S_SPK_GPIO_DOUT, I2S_STD_SLOT_RIGHT, AUDIO_I2S_MIC_GPIO_SCK,
-        AUDIO_I2S_MIC_GPIO_WS, AUDIO_I2S_MIC_GPIO_DIN, I2S_STD_SLOT_RIGHT);
-    return &audio_codec;
-  }
+    virtual AudioCodec* GetAudioCodec() override {
+        static NoAudioCodecSimplex audio_codec(
+            AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE,
+            AUDIO_I2S_SPK_GPIO_BCLK, AUDIO_I2S_SPK_GPIO_LRCK,
+            AUDIO_I2S_SPK_GPIO_DOUT, I2S_STD_SLOT_RIGHT, AUDIO_I2S_MIC_GPIO_SCK,
+            AUDIO_I2S_MIC_GPIO_WS, AUDIO_I2S_MIC_GPIO_DIN, I2S_STD_SLOT_RIGHT);
+        return &audio_codec;
+    }

-  virtual Display* GetDisplay() override { return display_; }
+    virtual Display* GetDisplay() override { return display_; }
 };

 DECLARE_BOARD(Hu087Board);
--- a/main/boards/jiuchuan-s3/jiuchuan_dev_board.cc
+++ b/main/boards/jiuchuan-s3/jiuchuan_dev_board.cc
@ -10,7 +10,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>
 #include "led/single_led.h"
 #include "assets/lang_config.h"
 #include "esp_lcd_panel_gc9301.h"
@ -230,11 +229,11 @@ private:
            } });

        // 电源键三击：重置WiFi
-        pwr_button_.OnMultipleClick([this]()
-                                    {
+        pwr_button_.OnMultipleClick([this]() {
            ESP_LOGI(TAG, "Power button triple click: 重置WiFi");
            power_save_timer_->WakeUp();
-            ResetWifiConfiguration(); }, 3);
+            EnterWifiConfigMode();
+        }, 3);

        wifi_button.OnPressDown([this]()
                            {
@ -372,11 +371,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/kevin-box-2/kevin_box_board.cc
+++ b/main/boards/kevin-box-2/kevin_box_board.cc
@ -9,7 +9,6 @@
 #include "axp2101.h"
 #include "assets/lang_config.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/gpio.h>
 #include <driver/i2c_master.h>
@ -173,10 +172,10 @@ private:
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
            if (GetNetworkType() == NetworkType::WIFI) {
-                if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
+                if (app.GetDeviceState() == kDeviceStateStarting) {
                    // cast to WifiBoard
                    auto& wifi_board = static_cast<WifiBoard&>(GetCurrentBoard());
-                    wifi_board.ResetWifiConfiguration();
+                    wifi_board.EnterWifiConfigMode();
                }
            }
        });
--- a/main/boards/kevin-c3/kevin_c3_board.cc
+++ b/main/boards/kevin-c3/kevin_c3_board.cc
@ -6,7 +6,6 @@
 #include "led/circular_strip.h"
 #include "led_strip_control.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <esp_efuse_table.h>
 #include <driver/i2c_master.h>
@ -47,8 +46,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });
        boot_button_.OnPressDown([this]() {
--- a/main/boards/kevin-sp-v3-dev/kevin-sp-v3_board.cc
+++ b/main/boards/kevin-sp-v3-dev/kevin-sp-v3_board.cc
@ -12,7 +12,6 @@
 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>
 #include "esp32_camera.h"

 #define TAG "kevin-sp-v3"
@ -39,8 +38,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });
        boot_button_.OnPressDown([this]() {
--- a/main/boards/kevin-sp-v4-dev/kevin-sp-v4_board.cc
+++ b/main/boards/kevin-sp-v4-dev/kevin-sp-v4_board.cc
@ -10,7 +10,6 @@
 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>
 #include "esp32_camera.h"

 #define TAG "kevin-sp-v4"
@ -54,8 +53,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });
        boot_button_.OnPressDown([this]() {
--- a/main/boards/kevin-yuying-313lcd/kevin_yuying_313lcd.cc
+++ b/main/boards/kevin-yuying-313lcd/kevin_yuying_313lcd.cc
@ -7,7 +7,6 @@

 #include "config.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include "esp_lcd_gc9503.h"
@ -123,8 +122,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });
        boot_button_.OnPressDown([this]() {
--- a/main/boards/labplus-ledong-v2/labplus_ledong_v2.cc
+++ b/main/boards/labplus-ledong-v2/labplus_ledong_v2.cc
@ -11,7 +11,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>

 #define TAG "labplus_ledong_v2"

@ -56,8 +55,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });
        boot_button_.OnPressDown([this]() {
--- a/main/boards/labplus-mpython-v3/mpython_pro.cc
+++ b/main/boards/labplus-mpython-v3/mpython_pro.cc
@ -11,7 +11,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>

 #define TAG "mpython_v3"

@ -53,8 +52,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });
        boot_button_.OnPressDown([this]() {
--- a/main/boards/lichuang-c3-dev/lichuang_c3_dev_board.cc
+++ b/main/boards/lichuang-c3-dev/lichuang_c3_dev_board.cc
@ -10,7 +10,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>

 #define TAG "LichuangC3DevBoard"

@ -51,8 +50,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/lichuang-dev/lichuang_dev_board.cc
+++ b/main/boards/lichuang-dev/lichuang_dev_board.cc
@ -7,12 +7,12 @@
 #include "config.h"
 #include "i2c_device.h"
 #include "esp32_camera.h"
+#include "mcp_server.h"

 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>
 #include <esp_lcd_touch_ft5x06.h>
 #include <esp_lvgl_port.h>
 #include <lvgl.h>
@ -107,8 +107,10 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -245,6 +247,17 @@ private:
        camera_ = new Esp32Camera(video_config);
    }

+    void InitializeTools() {
+        auto &mcp_server = McpServer::GetInstance();
+        mcp_server.AddTool("self.system.reconfigure_wifi",
+            "End this conversation and enter WiFi configuration mode.\n"
+            "**CAUTION** You must ask the user to confirm this action.",
+            PropertyList(), [this](const PropertyList& properties) {
+                EnterWifiConfigMode();
+                return true;
+            });
+    }
+
 public:
    LichuangDevBoard() : boot_button_(BOOT_BUTTON_GPIO) {
        InitializeI2c();
@ -253,6 +266,7 @@ public:
        InitializeTouch();
        InitializeButtons();
        InitializeCamera();
+        InitializeTools();

        GetBacklight()->RestoreBrightness();
    }
--- a/main/boards/lilygo-t-cameraplus-s3/lilygo-t-cameraplus-s3.cc
+++ b/main/boards/lilygo-t-cameraplus-s3/lilygo-t-cameraplus-s3.cc
@ -14,7 +14,6 @@
 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>

 #define TAG "LilygoTCameraPlusS3Board"

@ -209,11 +208,13 @@ private:

    void InitializeButtons() {
        boot_button_.OnClick([this]() {
-            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
-            }
            power_save_timer_->WakeUp();
+            auto& app = Application::GetInstance();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
+            }
            app.ToggleChatState();
        });
        key1_button_.OnClick([this]() {
@ -325,11 +326,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
    
    virtual Backlight* GetBacklight() override {
--- a/main/boards/lilygo-t-circle-s3/lilygo-t-circle-s3.cc
+++ b/main/boards/lilygo-t-circle-s3/lilygo-t-circle-s3.cc
@ -9,7 +9,6 @@

 #include <esp_log.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
 #include "esp_lcd_gc9d01n.h"
@ -199,11 +198,12 @@ private:

    void InitializeButtons() {
        boot_button_.OnClick([this]() {
-            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
-            }
            power_save_timer_->WakeUp();
+            auto& app = Application::GetInstance();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
+            }
            app.ToggleChatState();
        });
    }
@ -238,11 +238,11 @@ public:
        return display_;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
    
    virtual Backlight* GetBacklight() override {
--- a/main/boards/lilygo-t-display-p4/lilygo-t-display-p4.cc
+++ b/main/boards/lilygo-t-display-p4/lilygo-t-display-p4.cc
@ -9,7 +9,6 @@
 #include "esp_lcd_mipi_dsi.h"
 #include "esp_ldo_regulator.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lvgl_port.h>
@ -269,8 +268,10 @@ public:

    void AppToggleChatState(void){
        auto& app = Application::GetInstance();
-        if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-            ResetWifiConfiguration();
+        // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+        if (app.GetDeviceState() == kDeviceStateStarting) {
+            EnterWifiConfigMode();
+            return;
        }
        app.ToggleChatState(); 
    }
--- a/main/boards/lilygo-t-display-s3-pro-mvsrlora/lilygo-t-display-s3-pro-mvsrlora.cc
+++ b/main/boards/lilygo-t-display-s3-pro-mvsrlora/lilygo-t-display-s3-pro-mvsrlora.cc
@ -9,7 +9,6 @@

 #include <esp_log.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
 #include "esp_lcd_st7796.h"
@ -223,11 +222,12 @@ private:

    void InitializeButtons() {
        boot_button_.OnClick([this]() {
-            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
-            }
            power_save_timer_->WakeUp();
+            auto& app = Application::GetInstance();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
+            }
            app.ToggleChatState();
        });
    }
@ -263,11 +263,11 @@ public:
        return display_;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
    
    virtual Backlight* GetBacklight() override {
--- a/main/boards/m5stack-core-s3/m5stack_core_s3.cc
+++ b/main/boards/m5stack-core-s3/m5stack_core_s3.cc
@ -9,7 +9,6 @@

 #include <esp_log.h>
 #include <driver/i2c_master.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_ili9341.h>
@ -214,9 +213,9 @@ private:
            // 只有短触才触发
            if (touch_duration < TOUCH_THRESHOLD_MS) {
                auto& app = Application::GetInstance();
-                if (app.GetDeviceState() == kDeviceStateStarting && 
-                    !WifiStation::GetInstance().IsConnected()) {
-                    ResetWifiConfiguration();
+                if (app.GetDeviceState() == kDeviceStateStarting) {
+                    EnterWifiConfigMode();
+                    return;
                }
                app.ToggleChatState();
            }
@ -381,11 +380,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }

    virtual Backlight *GetBacklight() override {
--- a/main/boards/m5stack-tab5/m5stack_tab5.cc
+++ b/main/boards/m5stack-tab5/m5stack_tab5.cc
@ -19,7 +19,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>
 #include "i2c_device.h"
 #include "esp_lcd_touch_gt911.h"
 #include "esp_lcd_touch_st7123.h"
@ -150,8 +149,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                // ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/magiclick-2p4/magiclick_2p4_board.cc
+++ b/main/boards/magiclick-2p4/magiclick_2p4_board.cc
@ -8,7 +8,6 @@
 #include "assets/lang_config.h"

 #include <esp_lcd_panel_vendor.h>
-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
@ -108,8 +107,9 @@ private:
    void InitializeButtons() {
        main_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });
        main_button_.OnPressDown([this]() {
@ -123,8 +123,9 @@ private:
        left_button_.OnClick([this]() {
            power_save_timer_->WakeUp();
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            auto codec = GetAudioCodec();
            auto volume = codec->output_volume() - 10;
@ -259,11 +260,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/magiclick-2p5/magiclick_2p5_board.cc
+++ b/main/boards/magiclick-2p5/magiclick_2p5_board.cc
@ -8,7 +8,6 @@
 #include "assets/lang_config.h"

 #include <esp_lcd_panel_vendor.h>
-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
@ -146,17 +145,11 @@ private:
        main_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
            if (GetNetworkType() == NetworkType::WIFI) {
-                if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
+                if (app.GetDeviceState() == kDeviceStateStarting) {
                    // cast to WifiBoard
                    auto& wifi_board = static_cast<WifiBoard&>(GetCurrentBoard());
-                    wifi_board.ResetWifiConfiguration();
-                    Disable4GModule();
+                    wifi_board.EnterWifiConfigMode();
                }
-            } else if(GetNetworkType() == NetworkType::ML307) {
-                
-                Enable4GModule();
-                // stop WiFi
-                esp_wifi_stop();
            }
        });        
        main_button_.OnDoubleClick([this]() {
@ -315,11 +308,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        DualNetworkBoard::SetPowerSaveMode(enabled);
+        DualNetworkBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/magiclick-c3-v2/magiclick_c3_v2_board.cc
+++ b/main/boards/magiclick-c3-v2/magiclick_c3_v2_board.cc
@ -7,7 +7,6 @@
 #include "config.h"
 #include "power_save_timer.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
@ -131,8 +130,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });
        boot_button_.OnPressDown([this]() {
--- a/main/boards/magiclick-c3/magiclick_c3_board.cc
+++ b/main/boards/magiclick-c3/magiclick_c3_board.cc
@ -7,7 +7,6 @@
 #include "config.h"
 #include "power_save_timer.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
@ -95,8 +94,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });
        boot_button_.OnPressDown([this]() {
--- a/main/boards/minsi-k08-dual/minsi_k08_dual.cc
+++ b/main/boards/minsi-k08-dual/minsi_k08_dual.cc
@ -13,7 +13,6 @@
 #include "assets/lang_config.h"
 #include "power_manager.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lcd_panel_vendor.h>
@ -128,10 +127,11 @@ private:
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
            if (GetNetworkType() == NetworkType::WIFI) {
-                if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
+                if (app.GetDeviceState() == kDeviceStateStarting) {
                    // cast to WifiBoard
                    auto& wifi_board = static_cast<WifiBoard&>(GetCurrentBoard());
-                    wifi_board.ResetWifiConfiguration();
+                    wifi_board.EnterWifiConfigMode();
+                    return;
                }
            }
            app.ToggleChatState();
@ -235,11 +235,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        DualNetworkBoard::SetPowerSaveMode(enabled);
+        DualNetworkBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/mixgo-nova/mixgo-nova.cc
+++ b/main/boards/mixgo-nova/mixgo-nova.cc
@ -12,7 +12,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>

 #define TAG "MIXGO_NOVA"

@ -55,8 +54,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/movecall-cuican-esp32s3/movecall_cuican_esp32s3.cc
+++ b/main/boards/movecall-cuican-esp32s3/movecall_cuican_esp32s3.cc
@ -6,7 +6,6 @@
 #include "config.h"
 #include "led/single_led.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <esp_efuse_table.h>
 #include <driver/i2c_master.h>
@ -82,8 +81,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc
+++ b/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc
@ -6,7 +6,6 @@
 #include "config.h"
 #include "led/single_led.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <esp_efuse_table.h>
 #include <driver/i2c_master.h>
@ -102,8 +101,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/otto-robot/otto_controller.cc
+++ b/main/boards/otto-robot/otto_controller.cc
@ -16,7 +16,7 @@
 #include "power_manager.h"
 #include "sdkconfig.h"
 #include "settings.h"
-#include <wifi_station.h>
+#include <wifi_manager.h>

 #define TAG "OttoController"

@ -818,8 +818,8 @@ public:
                           
        mcp_server.AddTool("self.otto.get_ip", "获取机器人WiFi IP地址", PropertyList(),
                           [](const PropertyList& properties) -> ReturnValue {
-                               auto& wifi_station = WifiStation::GetInstance();
-                               std::string ip = wifi_station.GetIpAddress();
+                               auto& wifi = WifiManager::GetInstance();
+                               std::string ip = wifi.GetIpAddress();
                               if (ip.empty()) {
                                   return "{\"ip\":\"\",\"connected\":false}";
                               }
--- a/main/boards/otto-robot/otto_robot.cc
+++ b/main/boards/otto-robot/otto_robot.cc
@ -5,9 +5,6 @@
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_panel_vendor.h>
 #include <esp_log.h>
-#include <freertos/FreeRTOS.h>
-#include <freertos/task.h>
-#include <wifi_station.h>

 #include "application.h"
 #include "codecs/no_audio_codec.h"
@ -174,9 +171,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting &&
-                !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/sensecap-watcher/sensecap_watcher.cc
+++ b/main/boards/sensecap-watcher/sensecap_watcher.cc
@ -20,7 +20,6 @@
 #include <driver/spi_master.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>
 #include <iot_button.h>
 #include <iot_knob.h>
 #include <esp_io_expander_tca95xx_16bit.h>
@ -263,11 +262,13 @@ private:
        
        iot_button_register_cb(btns, BUTTON_SINGLE_CLICK, nullptr, [](void* button_handle, void* usr_data) {
            auto self = static_cast<SensecapWatcher*>(usr_data);
-            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                self->ResetWifiConfiguration();
-            }
            self->power_save_timer_->WakeUp();
+
+            auto& app = Application::GetInstance();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                self->EnterWifiConfigMode();
+                return;
+            }
            app.ToggleChatState();
        }, this);
        
@ -625,11 +626,11 @@ public:
        return &led;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }

    virtual bool GetBatteryLevel(int &level, bool& charging, bool& discharging) override {
--- a/main/boards/sp-esp32-s3-1.28-box/sp-esp32-s3-1.28-box.cc
+++ b/main/boards/sp-esp32-s3-1.28-box/sp-esp32-s3-1.28-box.cc
@ -6,7 +6,6 @@
 #include "config.h"
 #include "led/single_led.h"
 #include "assets/lang_config.h"
-#include <wifi_station.h>
 #include <esp_log.h>
 #include <esp_efuse_table.h>
 #include <driver/i2c_master.h>
@ -241,9 +240,10 @@ private:
            // 只有短触才触发
            if (touch_duration < TOUCH_THRESHOLD_MS) {
                auto& app = Application::GetInstance();
-                if (app.GetDeviceState() == kDeviceStateStarting &&
-                    !WifiStation::GetInstance().IsConnected()) {
-                    board->ResetWifiConfiguration();
+                // During startup (before connected), pressing touch enters Wi-Fi config mode without reboot
+                if (app.GetDeviceState() == kDeviceStateStarting) {
+                    board->EnterWifiConfigMode();
+                    return;
                }
                app.ToggleChatState();
            }
@ -365,8 +365,10 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -471,11 +473,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/sp-esp32-s3-1.54-muma/sp-esp32-s3-1.54-muma.cc
+++ b/main/boards/sp-esp32-s3-1.54-muma/sp-esp32-s3-1.54-muma.cc
@ -6,7 +6,6 @@
 #include "config.h"
 #include "led/single_led.h"
 #include "assets/lang_config.h"
-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include "system_reset.h"
@ -166,9 +165,9 @@ private:
            // 只有短触才触发
            if (touch_duration < TOUCH_THRESHOLD_MS) {
                auto& app = Application::GetInstance();
-                if (app.GetDeviceState() == kDeviceStateStarting &&
-                    !WifiStation::GetInstance().IsConnected()) {
-                    board.ResetWifiConfiguration();
+                if (app.GetDeviceState() == kDeviceStateStarting) {
+                    board.EnterWifiConfigMode();
+                    return;
                }
                app.ToggleChatState();
            }
@ -251,8 +250,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -314,11 +314,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/surfer-c3-1.14tft/surfer-c3-1.14tft.cc
+++ b/main/boards/surfer-c3-1.14tft/surfer-c3-1.14tft.cc
@ -11,7 +11,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>
 #include <esp_wifi.h>

 #include "power_save_timer.h"
@ -106,8 +105,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -198,11 +198,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }

 };
--- a/main/boards/taiji-pi-s3/taiji_pi_s3.cc
+++ b/main/boards/taiji-pi-s3/taiji_pi_s3.cc
@ -8,7 +8,6 @@
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <driver/ledc.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_st77916.h>
@ -503,9 +502,9 @@ private:
            // 只有短触才触发
            if (touch_duration < TOUCH_THRESHOLD_MS) {
                auto& app = Application::GetInstance();
-                if (app.GetDeviceState() == kDeviceStateStarting && 
-                    !WifiStation::GetInstance().IsConnected()) {
-                    board.ResetWifiConfiguration();
+                if (app.GetDeviceState() == kDeviceStateStarting) {
+                    board.EnterWifiConfigMode();
+                    return;
                }
                app.ToggleChatState();
            }
--- a/main/boards/waveshare-c6-lcd-1.69/esp32-c6-lcd-1.69.cc
+++ b/main/boards/waveshare-c6-lcd-1.69/esp32-c6-lcd-1.69.cc
@ -9,7 +9,6 @@
 #include "i2c_device.h"
 #include <driver/i2c_master.h>
 #include <driver/ledc.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_vendor.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
@ -159,8 +158,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -243,11 +243,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled) {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/waveshare-c6-touch-amoled-1.32/esp32-c6-touch-amoled-1.32.cc
+++ b/main/boards/waveshare-c6-touch-amoled-1.32/esp32-c6-touch-amoled-1.32.cc
@ -12,7 +12,6 @@
 #include <driver/spi_common.h>
 #include <esp_lcd_panel_vendor.h>
 #include <esp_log.h>
-#include <wifi_station.h>

 #define TAG "waveshare_c6_amoled_1_32"

@ -105,8 +104,10 @@ class CustomBoard : public WifiBoard {
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto &app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -172,7 +173,7 @@ class CustomBoard : public WifiBoard {
        });

        mcp_server.AddTool("self.disp.network", "重新配网", PropertyList(), [this](const PropertyList &) -> ReturnValue {
-            ResetWifiConfiguration();
+            EnterWifiConfigMode();
            return true;
        });
    }
--- a/main/boards/waveshare-c6-touch-amoled-1.43/esp32-c6-touch-amoled-1.43.cc
+++ b/main/boards/waveshare-c6-touch-amoled-1.43/esp32-c6-touch-amoled-1.43.cc
@ -8,7 +8,6 @@
 #include <esp_lcd_panel_vendor.h>
 #include <driver/i2c_master.h>
 #include <driver/spi_common.h>
-#include <wifi_station.h>
 #include "esp_lcd_sh8601.h"
 #include "display/lcd_display.h"
 #include "esp_io_expander_tca9554.h"
@ -153,8 +152,9 @@ private:
    void InitializeButtons() { //接入锂电池时,可长按PWR开机/关机
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
        });

--- a/main/boards/waveshare-c6-touch-amoled-2.06/esp32-c6-touch-amoled-2.06.cc
+++ b/main/boards/waveshare-c6-touch-amoled-2.06/esp32-c6-touch-amoled-2.06.cc
@ -11,7 +11,6 @@
 #include "power_save_timer.h"
 #include "axp2101.h"
 #include "i2c_device.h"
-#include <wifi_station.h>

 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
@ -185,8 +184,10 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -244,10 +245,10 @@ private:
    void InitializeTools() {
        auto &mcp_server = McpServer::GetInstance();
        mcp_server.AddTool("self.system.reconfigure_wifi",
-            "Reboot the device and enter WiFi configuration mode.\n"
+            "End this conversation and enter WiFi configuration mode.\n"
            "**CAUTION** You must ask the user to confirm this action.",
            PropertyList(), [this](const PropertyList& properties) {
-                ResetWifiConfiguration();
+                EnterWifiConfigMode();
                return true;
            });
    }
@ -302,12 +303,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled)
-        {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/main/boards/waveshare-p4-nano/esp32-p4-nano.cc
+++ b/main/boards/waveshare-p4-nano/esp32-p4-nano.cc
@ -17,7 +17,6 @@
 #include "esp_lcd_mipi_dsi.h"
 #include "esp_lcd_jd9365_10_1.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lvgl_port.h>
@ -221,10 +220,13 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
-            app.ToggleChatState(); });
+            app.ToggleChatState();
+        });
    }

 public:
--- a/main/boards/waveshare-p4-wifi6-touch-lcd-4b/esp32-p4-wifi6-touch-lcd-4b.cc
+++ b/main/boards/waveshare-p4-wifi6-touch-lcd-4b/esp32-p4-wifi6-touch-lcd-4b.cc
@ -16,7 +16,6 @@

 #include "esp_lcd_st7703.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lvgl_port.h>
@ -174,10 +173,13 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
-            app.ToggleChatState(); });
+            app.ToggleChatState();
+        });
    }

 public:
--- a/main/boards/waveshare-p4-wifi6-touch-lcd-7b/esp32-p4-wifi6-touch-lcd-7b.cc
+++ b/main/boards/waveshare-p4-wifi6-touch-lcd-7b/esp32-p4-wifi6-touch-lcd-7b.cc
@ -16,7 +16,6 @@

 #include "esp_lcd_ek79007.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lvgl_port.h>
@ -195,10 +194,13 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
-            app.ToggleChatState(); });
+            app.ToggleChatState();
+        });
    }

 public:
--- a/main/boards/waveshare-p4-wifi6-touch-lcd-xc/esp32-p4-wifi6-touch-lcd-xc.cc
+++ b/main/boards/waveshare-p4-wifi6-touch-lcd-xc/esp32-p4-wifi6-touch-lcd-xc.cc
@ -16,7 +16,6 @@
 #include "esp_lcd_jd9365_10_1.h"
 #include "config.h"

-#include <wifi_station.h>
 #include <esp_log.h>
 #include <driver/i2c_master.h>
 #include <esp_lvgl_port.h>
@ -176,10 +175,13 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
-            app.ToggleChatState(); });
+            app.ToggleChatState();
+        });
    }

 public:
--- a/main/boards/waveshare-s3-audio-board/esp32-s3-audio_board.cc
+++ b/main/boards/waveshare-s3-audio-board/esp32-s3-audio_board.cc
@ -10,7 +10,6 @@
 #include "i2c_device.h"
 #include <driver/i2c_master.h>
 #include <driver/ledc.h>
-#include <wifi_station.h>
 #include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_ops.h>
 #include <esp_lcd_st77916.h>
@ -148,8 +147,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
--- a/main/boards/waveshare-s3-epaper-1.54/waveshare-s3-epaper-1.54.cc
+++ b/main/boards/waveshare-s3-epaper-1.54/waveshare-s3-epaper-1.54.cc
@ -3,7 +3,6 @@
 #include <driver/spi_common.h>
 #include <esp_lcd_panel_vendor.h>
 #include <esp_log.h>
-#include "wifi_station.h"
 #include "application.h"
 #include "button.h"
 #include "codecs/es8311_audio_codec.h"
@ -42,8 +41,10 @@ class CustomBoard : public WifiBoard {
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto &app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -60,7 +61,7 @@ class CustomBoard : public WifiBoard {
    void InitializeTools() {
        auto &mcp_server = McpServer::GetInstance();
        mcp_server.AddTool("self.disp.network", "重新配网", PropertyList(), [this](const PropertyList &) -> ReturnValue {
-            ResetWifiConfiguration();
+            EnterWifiConfigMode();
            return true;
        });
    }
--- a/main/boards/waveshare-s3-touch-amoled-1.32/esp32-s3-touch-amoled-1.32.cc
+++ b/main/boards/waveshare-s3-touch-amoled-1.32/esp32-s3-touch-amoled-1.32.cc
@ -12,7 +12,6 @@
 #include <driver/spi_common.h>
 #include <esp_lcd_panel_vendor.h>
 #include <esp_log.h>
-#include <wifi_station.h>

 #define TAG "waveshare_s3_amoled_1_32"

@ -105,8 +104,10 @@ class CustomBoard : public WifiBoard {
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto &app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            // During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -172,7 +173,7 @@ class CustomBoard : public WifiBoard {
        });

        mcp_server.AddTool("self.disp.network", "重新配网", PropertyList(), [this](const PropertyList &) -> ReturnValue {
-            ResetWifiConfiguration();
+            EnterWifiConfigMode();
            return true;
        });
    }
--- a/main/boards/waveshare-s3-touch-amoled-1.75/esp32-s3-touch-amoled-1.75.cc
+++ b/main/boards/waveshare-s3-touch-amoled-1.75/esp32-s3-touch-amoled-1.75.cc
@ -11,7 +11,6 @@
 #include "power_save_timer.h"
 #include "axp2101.h"
 #include "i2c_device.h"
-#include <wifi_station.h>

 #include <esp_log.h>
 #include <esp_lcd_panel_vendor.h>
@ -199,8 +198,9 @@ private:
    void InitializeButtons() {
        boot_button_.OnClick([this]() {
            auto& app = Application::GetInstance();
-            if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
-                ResetWifiConfiguration();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
            }
            app.ToggleChatState();
        });
@ -289,10 +289,10 @@ private:
    void InitializeTools() {
        auto &mcp_server = McpServer::GetInstance();
        mcp_server.AddTool("self.system.reconfigure_wifi",
-            "Reboot the device and enter WiFi configuration mode.\n"
+            "End this conversation and enter WiFi configuration mode.\n"
            "**CAUTION** You must ask the user to confirm this action.",
            PropertyList(), [this](const PropertyList& properties) {
-                ResetWifiConfiguration();
+                EnterWifiConfigMode();
                return true;
            });
    }
@ -349,12 +349,11 @@ public:
        return true;
    }

-    virtual void SetPowerSaveMode(bool enabled) override {
-        if (!enabled)
-        {
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
            power_save_timer_->WakeUp();
        }
-        WifiBoard::SetPowerSaveMode(enabled);
+        WifiBoard::SetPowerSaveLevel(level);
    }
 };

--- a/Show More
+++ b/Show More