Add Backlight and PowerSaveTimer

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 "1.4.1")
+set(PROJECT_VER "1.4.2")
 
 # Add this line to disable the specific warning
 add_compile_options(-Wno-missing-field-initializers)

main/application.cc

@@ -820,3 +820,16 @@ void Application::WakeWordInvoke(const std::string& wake_word) {
         });
     }
 }
+
+bool Application::CanEnterSleepMode() {
+    if (device_state_ != kDeviceStateIdle) {
+        return false;
+    }
+
+    if (protocol_ && protocol_->IsAudioChannelOpened()) {
+        return false;
+    }
+
+    // Now it is safe to enter sleep mode
+    return true;
+}

main/application.h

@@ -69,6 +69,7 @@ public:
     void Reboot();
     void WakeWordInvoke(const std::string& wake_word);
     void PlaySound(const std::string_view& sound);
+    bool CanEnterSleepMode();
 
 private:
     Application();

main/boards/atk-dnesp32s3-box/atk_dnesp32s3_box.cc

@@ -152,7 +152,7 @@ private:
         esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
         ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel, true));
 
-        display_ = new SpiLcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
+        display_ = new SpiLcdDisplay(panel_io, panel,
                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
                                     {
                                         .text_font = &font_puhui_20_4,

main/boards/atk-dnesp32s3/atk_dnesp32s3.cc

@@ -132,7 +132,7 @@ private:
         esp_lcd_panel_invert_color(panel, true);
         esp_lcd_panel_swap_xy(panel, DISPLAY_SWAP_XY); 
         esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
-        display_ = new SpiLcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
+        display_ = new SpiLcdDisplay(panel_io, panel,
                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
                                     {
                                         .text_font = &font_puhui_20_4,

main/boards/atoms3-echo-base/atoms3_echo_base.cc

@@ -177,7 +177,7 @@ private:
         ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel_handle, true)); 
 
 
-        display_ = new SpiLcdDisplay(io_handle, panel_handle, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
+        display_ = new SpiLcdDisplay(io_handle, panel_handle,
             DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
             {
                 .text_font = &font_puhui_16_4,
@@ -211,6 +211,7 @@ public:
         InitializeGc9107Display();
         InitializeButtons();
         InitializeIot();
+        GetBacklight()->RestoreBrightness();
     }
 
     virtual AudioCodec* GetAudioCodec() override {
@@ -233,6 +234,11 @@ public:
     virtual Display* GetDisplay() override {
         return display_;
     }
+
+    virtual Backlight* GetBacklight() override {
+        static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT);
+        return &backlight;
+    }
 };
 
 DECLARE_BOARD(AtomS3EchoBaseBoard);

main/boards/atoms3r-echo-base/atoms3r_echo_base.cc

@@ -237,7 +237,7 @@ private:
         ESP_ERROR_CHECK(esp_lcd_panel_init(panel_handle));
         ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel_handle, true)); 
 
-        display_ = new SpiLcdDisplay(io_handle, panel_handle, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
+        display_ = new SpiLcdDisplay(io_handle, panel_handle,
                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
                                     {
                                         .text_font = &font_puhui_16_4,

main/boards/bread-compact-wifi-lcd/compact_wifi_board_lcd.cc

@@ -122,7 +122,7 @@ private:
 #ifdef  LCD_TYPE_GC9A01_SERIAL
         panel_config.vendor_config = &gc9107_vendor_config;
 #endif
-        display_ = new SpiLcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
+        display_ = new SpiLcdDisplay(panel_io, panel,
                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
                                     {
                                         .text_font = &font_puhui_16_4,
@@ -147,7 +147,9 @@ private:
     void InitializeIot() {
         auto& thing_manager = iot::ThingManager::GetInstance();
         thing_manager.AddThing(iot::CreateThing("Speaker"));
+#if DISPLAY_BACKLIGHT_PIN != GPIO_NUM_NC
         thing_manager.AddThing(iot::CreateThing("Backlight"));
+#endif
     }
 
 public:
@@ -157,6 +159,10 @@ public:
         InitializeLcdDisplay();
         InitializeButtons();
         InitializeIot();
+
+#if DISPLAY_BACKLIGHT_PIN != GPIO_NUM_NC
+        GetBacklight()->RestoreBrightness();
+#endif
     }
 
     virtual Led* GetLed() override {
@@ -178,6 +184,13 @@ public:
     virtual Display* GetDisplay() override {
         return display_;
     }
+
+#if DISPLAY_BACKLIGHT_PIN != GPIO_NUM_NC
+    virtual Backlight* GetBacklight() override {
+        static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT);
+        return &backlight;
+    }
+#endif
 };
 
 DECLARE_BOARD(CompactWifiBoardLCD);

main/boards/common/backlight.cc

@@ -0,0 +1,113 @@
+#include "backlight.h"
+#include "settings.h"
+
+#include <esp_log.h>
+#include <driver/ledc.h>
+
+#define TAG "Backlight"
+
+
+Backlight::Backlight() {
+    // 创建背光渐变定时器
+    const esp_timer_create_args_t timer_args = {
+        .callback = [](void* arg) {
+            auto self = static_cast<Backlight*>(arg);
+            self->OnTransitionTimer();
+        },
+        .arg = this,
+        .dispatch_method = ESP_TIMER_TASK,
+        .name = "backlight_timer",
+        .skip_unhandled_events = true,
+    };
+    ESP_ERROR_CHECK(esp_timer_create(&timer_args, &transition_timer_));
+}
+
+Backlight::~Backlight() {
+    if (transition_timer_ != nullptr) {
+        esp_timer_stop(transition_timer_);
+        esp_timer_delete(transition_timer_);
+    }
+}
+
+void Backlight::RestoreBrightness() {
+    // Load brightness from settings
+    Settings settings("display");
+    SetBrightness(settings.GetInt("brightness", 75));
+}
+
+void Backlight::SetBrightness(uint8_t brightness, bool permanent) {
+    if (brightness > 100) {
+        brightness = 100;
+    }
+
+    if (brightness_ == brightness) {
+        return;
+    }
+
+    if (permanent) {
+        Settings settings("display", true);
+        settings.SetInt("brightness", brightness);
+    }
+
+    target_brightness_ = brightness;
+    step_ = (target_brightness_ > brightness_) ? 1 : -1;
+
+    if (transition_timer_ != nullptr) {
+        // 启动定时器，每 5ms 更新一次
+        esp_timer_start_periodic(transition_timer_, 5 * 1000);
+    }
+    ESP_LOGI(TAG, "Set brightness to %d", brightness);
+}
+
+void Backlight::OnTransitionTimer() {
+    if (brightness_ == target_brightness_) {
+        esp_timer_stop(transition_timer_);
+        return;
+    }
+
+    brightness_ += step_;
+    SetBrightnessImpl(brightness_);
+
+    if (brightness_ == target_brightness_) {
+        esp_timer_stop(transition_timer_);
+    }
+}
+
+PwmBacklight::PwmBacklight(gpio_num_t pin, bool output_invert) : Backlight() {
+    const ledc_timer_config_t backlight_timer = {
+        .speed_mode = LEDC_LOW_SPEED_MODE,
+        .duty_resolution = LEDC_TIMER_10_BIT,
+        .timer_num = LEDC_TIMER_0,
+        .freq_hz = 20000, //背光pwm频率需要高一点，防止电感啸叫
+        .clk_cfg = LEDC_AUTO_CLK,
+        .deconfigure = false
+    };
+    ESP_ERROR_CHECK(ledc_timer_config(&backlight_timer));
+
+    // Setup LEDC peripheral for PWM backlight control
+    const ledc_channel_config_t backlight_channel = {
+        .gpio_num = pin,
+        .speed_mode = LEDC_LOW_SPEED_MODE,
+        .channel = LEDC_CHANNEL_0,
+        .intr_type = LEDC_INTR_DISABLE,
+        .timer_sel = LEDC_TIMER_0,
+        .duty = 0,
+        .hpoint = 0,
+        .flags = {
+            .output_invert = output_invert,
+        }
+    };
+    ESP_ERROR_CHECK(ledc_channel_config(&backlight_channel));
+}
+
+PwmBacklight::~PwmBacklight() {
+    ledc_stop(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0, 0);
+}
+
+void PwmBacklight::SetBrightnessImpl(uint8_t brightness) {
+    // LEDC resolution set to 10bits, thus: 100% = 1023
+    uint32_t duty_cycle = (1023 * brightness) / 100;
+    ledc_set_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0, duty_cycle);
+    ledc_update_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0);
+}
+

main/boards/common/backlight.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <cstdint>
+#include <functional>
+
+#include <driver/gpio.h>
+#include <esp_timer.h>
+
+
+class Backlight {
+public:
+    Backlight();
+    ~Backlight();
+
+    void RestoreBrightness();
+    void SetBrightness(uint8_t brightness, bool permanent = false);
+    inline uint8_t brightness() const { return brightness_; }
+
+protected:
+    void OnTransitionTimer();
+    virtual void SetBrightnessImpl(uint8_t brightness) = 0;
+
+    esp_timer_handle_t transition_timer_ = nullptr;
+    uint8_t brightness_ = 0;
+    uint8_t target_brightness_ = 0;
+    uint8_t step_ = 1;
+};
+
+
+class PwmBacklight : public Backlight {
+public:
+    PwmBacklight(gpio_num_t pin, bool output_invert = false);
+    ~PwmBacklight();
+
+    void SetBrightnessImpl(uint8_t brightness) override;
+};

main/boards/common/board.h

@@ -8,6 +8,7 @@
 #include <string>
 
 #include "led/led.h"
+#include "backlight.h"
 
 void* create_board();
 class AudioCodec;
@@ -34,6 +35,7 @@ public:
     virtual ~Board() = default;
     virtual std::string GetBoardType() = 0;
     virtual std::string GetUuid() { return uuid_; }
+    virtual Backlight* GetBacklight() { return nullptr; }
     virtual Led* GetLed();
     virtual AudioCodec* GetAudioCodec() = 0;
     virtual Display* GetDisplay();

main/boards/common/power_save_timer.cc

@@ -0,0 +1,100 @@
+#include "power_save_timer.h"
+#include "application.h"
+
+#include <esp_log.h>
+
+#define TAG "PowerSaveTimer"
+
+
+PowerSaveTimer::PowerSaveTimer(int cpu_max_freq, int seconds_to_sleep, int seconds_to_shutdown)
+    : cpu_max_freq_(cpu_max_freq), seconds_to_sleep_(seconds_to_sleep), seconds_to_shutdown_(seconds_to_shutdown) {
+    esp_timer_create_args_t timer_args = {
+        .callback = [](void* arg) {
+            auto self = static_cast<PowerSaveTimer*>(arg);
+            self->PowerSaveCheck();
+        },
+        .arg = this,
+        .dispatch_method = ESP_TIMER_TASK,
+        .name = "power_save_timer",
+        .skip_unhandled_events = true,
+    };
+    ESP_ERROR_CHECK(esp_timer_create(&timer_args, &power_save_timer_));
+}
+
+PowerSaveTimer::~PowerSaveTimer() {
+    esp_timer_stop(power_save_timer_);
+    esp_timer_delete(power_save_timer_);
+}
+
+void PowerSaveTimer::SetEnabled(bool enabled) {
+    if (enabled && !enabled_) {
+        ticks_ = 0;
+        enabled_ = enabled;
+        ESP_ERROR_CHECK(esp_timer_start_periodic(power_save_timer_, 1000000));
+    } else if (!enabled && enabled_) {
+        ESP_ERROR_CHECK(esp_timer_stop(power_save_timer_));
+        enabled_ = enabled;
+    }
+}
+
+void PowerSaveTimer::OnEnterSleepMode(std::function<void()> callback) {
+    on_enter_sleep_mode_ = callback;
+}
+
+void PowerSaveTimer::OnExitSleepMode(std::function<void()> callback) {
+    on_exit_sleep_mode_ = callback;
+}
+
+void PowerSaveTimer::OnShutdownRequest(std::function<void()> callback) {
+    on_shutdown_request_ = callback;
+}
+
+void PowerSaveTimer::PowerSaveCheck() {
+    auto& app = Application::GetInstance();
+    if (!in_sleep_mode_ && !app.CanEnterSleepMode()) {
+        ticks_ = 0;
+        return;
+    }
+
+    ticks_++;
+    if (seconds_to_sleep_ != -1 && ticks_ >= seconds_to_sleep_) {
+        if (!in_sleep_mode_) {
+            in_sleep_mode_ = true;
+            if (on_enter_sleep_mode_) {
+                on_enter_sleep_mode_();
+            }
+
+            if (cpu_max_freq_ != -1) {
+                esp_pm_config_t pm_config = {
+                    .max_freq_mhz = cpu_max_freq_,
+                    .min_freq_mhz = 40,
+                    .light_sleep_enable = true,
+                };
+                esp_pm_configure(&pm_config);
+            }
+        }
+    }
+    if (seconds_to_shutdown_ != -1 && ticks_ >= seconds_to_shutdown_ && on_shutdown_request_) {
+        on_shutdown_request_();
+    }
+}
+
+void PowerSaveTimer::WakeUp() {
+    ticks_ = 0;
+    if (in_sleep_mode_) {
+        in_sleep_mode_ = false;
+
+        if (cpu_max_freq_ != -1) {
+            esp_pm_config_t pm_config = {
+                .max_freq_mhz = cpu_max_freq_,
+                .min_freq_mhz = cpu_max_freq_,
+                .light_sleep_enable = false,
+            };
+            esp_pm_configure(&pm_config);
+        }
+
+        if (on_exit_sleep_mode_) {
+            on_exit_sleep_mode_();
+        }
+    }
+}

main/boards/common/power_save_timer.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <functional>
+
+#include <esp_timer.h>
+#include <esp_pm.h>
+
+class PowerSaveTimer {
+public:
+    PowerSaveTimer(int cpu_max_freq, int seconds_to_sleep = 20, int seconds_to_shutdown = -1);
+    ~PowerSaveTimer();
+
+    void SetEnabled(bool enabled);
+    void OnEnterSleepMode(std::function<void()> callback);
+    void OnExitSleepMode(std::function<void()> callback);
+    void OnShutdownRequest(std::function<void()> callback);
+    void WakeUp();
+
+private:
+    void PowerSaveCheck();
+
+    esp_timer_handle_t power_save_timer_ = nullptr;
+    bool enabled_ = false;
+    bool in_sleep_mode_ = false;
+    int ticks_ = 0;
+    int cpu_max_freq_;
+    int seconds_to_sleep_;
+    int seconds_to_shutdown_;
+
+    std::function<void()> on_enter_sleep_mode_;
+    std::function<void()> on_exit_sleep_mode_;
+    std::function<void()> on_shutdown_request_;
+};

main/boards/du-chatx/du-chatx-wifi.cc

@@ -74,7 +74,7 @@ private:
         esp_lcd_panel_invert_color(panel, DISPLAY_INVERT_COLOR);
         esp_lcd_panel_swap_xy(panel, DISPLAY_SWAP_XY);
         esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
-        display_ = new SpiLcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
+        display_ = new SpiLcdDisplay(panel_io, panel,
                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
                                     {
                                         .text_font = &font_puhui_16_4,
@@ -109,6 +109,7 @@ public:
         InitializeLcdDisplay();
         InitializeButtons();
         InitializeIot();
+        GetBacklight()->RestoreBrightness();
     }
 
     virtual Led* GetLed() override {
@@ -125,6 +126,11 @@ public:
     virtual Display* GetDisplay() override {
         return display_;
     }
+
+    virtual Backlight* GetBacklight() override {
+        static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT);
+        return &backlight;
+    }
 };
 
 DECLARE_BOARD(DuChatX);

main/boards/esp-box-3/esp_box3_board.cc

@@ -121,7 +121,7 @@ private:
         esp_lcd_panel_swap_xy(panel, DISPLAY_SWAP_XY);
         esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
         esp_lcd_panel_disp_on_off(panel, true);
-        display_ = new SpiLcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
+        display_ = new SpiLcdDisplay(panel_io, panel,
                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
                                     {
                                         .text_font = &font_puhui_20_4,
@@ -144,6 +144,7 @@ public:
         InitializeIli9341Display();
         InitializeButtons();
         InitializeIot();
+        GetBacklight()->RestoreBrightness();
     }
 
     virtual AudioCodec* GetAudioCodec() override {
@@ -166,6 +167,11 @@ public:
     virtual Display* GetDisplay() override {
         return display_;
     }
+
+    virtual Backlight* GetBacklight() override {
+        static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT);
+        return &backlight;
+    }
 };
 
 DECLARE_BOARD(EspBox3Board);

main/boards/esp-box/esp_box_board.cc

@@ -121,7 +121,7 @@ private:
         esp_lcd_panel_swap_xy(panel, DISPLAY_SWAP_XY);
         esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
         esp_lcd_panel_disp_on_off(panel, true);
-        display_ = new SpiLcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
+        display_ = new SpiLcdDisplay(panel_io, panel,
                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
                                     {
                                         .text_font = &font_puhui_20_4,
@@ -144,6 +144,7 @@ public:
         InitializeIli9341Display();
         InitializeButtons();
         InitializeIot();
+        GetBacklight()->RestoreBrightness();
     }
 
     virtual AudioCodec* GetAudioCodec() override {
@@ -166,6 +167,11 @@ public:
     virtual Display* GetDisplay() override {
         return display_;
     }
+
+    virtual Backlight* GetBacklight() override {
+        static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT);
+        return &backlight;
+    }
 };
 
 DECLARE_BOARD(EspBox3Board);

main/boards/esp-sparkbot/esp_sparkbot_board.cc

@@ -113,7 +113,7 @@ private:
         esp_lcd_panel_init(panel);
         esp_lcd_panel_invert_color(panel, true);
         esp_lcd_panel_disp_on_off(panel, true);
-        display_ = new SpiLcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
+        display_ = new SpiLcdDisplay(panel_io, panel,
                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
                                     {
                                         .text_font = &font_puhui_20_4,
@@ -137,6 +137,7 @@ public:
         InitializeDisplay();
         InitializeButtons();
         InitializeIot();
+        GetBacklight()->RestoreBrightness();
     }
 
     virtual AudioCodec* GetAudioCodec() override {
@@ -149,6 +150,11 @@ public:
     virtual Display* GetDisplay() override {
         return display_;
     }
+
+    virtual Backlight* GetBacklight() override {
+        static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT);
+        return &backlight;
+    }
 };
 
 DECLARE_BOARD(EspSparkBot);

main/boards/esp32-s3-touch-amoled-1.8/board_control.cc

@@ -15,24 +15,6 @@ namespace iot {
 class BoardControl : public Thing {
 public:
     BoardControl() : Thing("BoardControl", "当前 AI 机器人管理和控制") {
-        // 添加电池电量属性
-        properties_.AddNumberProperty("BatteryLevel", "当前电池电量百分比", [this]() -> int {
-            int level = 0;
-            bool charging = false;
-            Board::GetInstance().GetBatteryLevel(level, charging);
-            ESP_LOGI(TAG, "当前电池电量: %d%%, 充电状态: %s", level, charging ? "充电中" : "未充电");
-            return level;
-        });
-
-        // 添加充电状态属性
-        properties_.AddBooleanProperty("Charging", "是否正在充电", [this]() -> bool {
-            int level = 0;
-            bool charging = false;
-            Board::GetInstance().GetBatteryLevel(level, charging);
-            ESP_LOGI(TAG, "当前电池电量: %d%%, 充电状态: %s", level, charging ? "充电中" : "未充电");
-            return charging;
-        });
-
         // 修改重新配网
         methods_.AddMethod("ResetWifiConfiguration", "重新配网", ParameterList(), 
             [this](const ParameterList& parameters) {

main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc

@@ -46,8 +46,6 @@ class CustomLcdDisplay : public SpiLcdDisplay {
 public:
     CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle,
                     esp_lcd_panel_handle_t panel_handle,
-                    gpio_num_t backlight_pin,
-                    bool backlight_output_invert,
                     int width,
                     int height,
                     int offset_x,
@@ -55,7 +53,7 @@ public:
                     bool mirror_x,
                     bool mirror_y,
                     bool swap_xy)
-        : SpiLcdDisplay(io_handle, panel_handle, backlight_pin, backlight_output_invert,
+        : SpiLcdDisplay(io_handle, panel_handle,
                     width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
                     {
                         .text_font = &font_puhui_30_4,
@@ -65,21 +63,17 @@ public:
         DisplayLockGuard lock(this);
         lv_obj_set_style_pad_left(status_bar_, LV_HOR_RES * 0.1, 0);
         lv_obj_set_style_pad_right(status_bar_, LV_HOR_RES * 0.1, 0);
-
-        SetBacklight(100);
     }
+};
 
-    virtual void SetBacklight(uint8_t brightness) override {
-        if (brightness > 100)
-        {
-            brightness = 100;
-        }
+class CustomBacklight : public Backlight {
+public:
+    CustomBacklight(esp_lcd_panel_io_handle_t panel_io) : Backlight(), panel_io_(panel_io) {}
 
-        brightness_ = brightness;
-
-        Settings settings("display", true);
-        settings.SetInt("bright", brightness_);
+protected:
+    esp_lcd_panel_io_handle_t panel_io_;
 
+    virtual void SetBrightnessImpl(uint8_t brightness) override {
         uint8_t data[1] = {((uint8_t)((255 * brightness) / 100))};
         int lcd_cmd = 0x51;
         lcd_cmd &= 0xff;
@@ -96,7 +90,8 @@ private:
     esp_timer_handle_t power_save_timer_ = nullptr;
 
     Button boot_button_;
-    LcdDisplay* display_;
+    CustomLcdDisplay* display_;
+    CustomBacklight* backlight_;
     esp_io_expander_handle_t io_expander = NULL;
 
     void InitializeCodecI2c() {
@@ -233,8 +228,10 @@ private:
         esp_lcd_panel_swap_xy(panel, DISPLAY_SWAP_XY);
         esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
         esp_lcd_panel_disp_on_off(panel, true);
-        display_ = new CustomLcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
+        display_ = new CustomLcdDisplay(panel_io, panel,
                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
+        backlight_ = new CustomBacklight(panel_io);
+        backlight_->RestoreBrightness();
     }
 
     // 物联网初始化，添加对 AI 可见设备
@@ -243,6 +240,7 @@ private:
         thing_manager.AddThing(iot::CreateThing("Speaker"));
         thing_manager.AddThing(iot::CreateThing("BoardControl"));
         thing_manager.AddThing(iot::CreateThing("Backlight"));
+        thing_manager.AddThing(iot::CreateThing("Battery"));
     }
 
 public:
@@ -281,6 +279,10 @@ public:
         }
         return true;
     }
+
+    virtual Backlight* GetBacklight() override {
+        return backlight_;
+    }
 };
 
 DECLARE_BOARD(waveshare_amoled_1_8);

main/boards/esp32-s3-touch-lcd-1.46/esp32-s3-touch-lcd-1.46.cc

@@ -27,8 +27,7 @@ LV_FONT_DECLARE(font_awesome_16_4);
 // 在waveshare_lcd_1_46类之前添加新的显示类
 class CustomLcdDisplay : public SpiLcdDisplay {
 public:
-    static void rounder_event_cb(lv_event_t * e)
-    {
+    static void rounder_event_cb(lv_event_t * e) {
         lv_area_t * area = (lv_area_t *)lv_event_get_param(e);
         uint16_t x1 = area->x1;
         uint16_t x2 = area->x2;
@@ -39,8 +38,6 @@ public:
 
     CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle, 
                     esp_lcd_panel_handle_t panel_handle,
-                    gpio_num_t backlight_pin,
-                    bool backlight_output_invert,
                     int width,
                     int height,
                     int offset_x,
@@ -48,25 +45,20 @@ public:
                     bool mirror_x,
                     bool mirror_y,
                     bool swap_xy) 
-        : SpiLcdDisplay(io_handle, panel_handle, backlight_pin, backlight_output_invert,
+        : SpiLcdDisplay(io_handle, panel_handle,
                     width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
                     {
                         .text_font = &font_puhui_16_4,
                         .icon_font = &font_awesome_16_4,
                         .emoji_font = font_emoji_64_init(),
                     }) {
-
         DisplayLockGuard lock(this);
-
         lv_display_add_event_cb(display_, rounder_event_cb, LV_EVENT_INVALIDATE_AREA, NULL);
-
-        
     }
 };
 
 class CustomBoard : public WifiBoard {
 private:
- 
     Button boot_button_;
     i2c_master_bus_handle_t i2c_bus_;
     esp_io_expander_handle_t io_expander = NULL;
@@ -83,8 +75,7 @@ private:
         ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &i2c_bus_));
     }
     
-    void InitializeTca9554(void)
-    {
+    void InitializeTca9554(void) {
         esp_err_t ret = esp_io_expander_new_i2c_tca9554(i2c_bus_, I2C_ADDRESS, &io_expander);
         if(ret != ESP_OK)
             ESP_LOGE(TAG, "TCA9554 create returned error");        
@@ -150,7 +141,7 @@ private:
         esp_lcd_panel_disp_on_off(panel, true);
         esp_lcd_panel_swap_xy(panel, DISPLAY_SWAP_XY);
         esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
-        display_ = new CustomLcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
+        display_ = new CustomLcdDisplay(panel_io, panel,
                                     DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
     }
  
@@ -180,6 +171,7 @@ public:
         Initializespd2010Display();
         InitializeButtons();
         InitializeIot();
+        GetBacklight()->RestoreBrightness();
     }
 
     virtual AudioCodec* GetAudioCodec() override {
@@ -189,11 +181,14 @@ public:
         return &audio_codec;
     }
 
-
     virtual Display* GetDisplay() override {
         return display_;
     }
     
+    virtual Backlight* GetBacklight() override {
+        static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT);
+        return &backlight;
+    }
 };
 
 DECLARE_BOARD(CustomBoard);