diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 824e2645..332d894e 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -180,6 +180,8 @@ elseif(CONFIG_BOARD_TYPE_ZHENGCHEN_1_54TFT_ML307) set(BOARD_TYPE "zhengchen-1.54tft-ml307") elseif(CONFIG_BOARD_TYPE_ESP32_S3_1_54_MUMA) set(BOARD_TYPE "sp-esp32-s3-1.54-muma") +elseif(CONFIG_BOARD_TYPE_ESP32_S3_1_28_BOX) + set(BOARD_TYPE "sp-esp32-s3-1.28-box") endif() file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 8c329753..9077432b 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -172,6 +172,8 @@ choice BOARD_TYPE bool "敏思科技K08(DUAL)" config BOARD_TYPE_ESP32_S3_1_54_MUMA bool "Spotpear ESP32-S3-1.54-MUMA" + config BOARD_TYPE_ESP32_S3_1_28_BOX + bool "Spotpear ESP32-S3-1.28-BOX" endchoice choice ESP_S3_LCD_EV_Board_Version_TYPE diff --git a/main/boards/sp-esp32-s3-1.28-box/README.md b/main/boards/sp-esp32-s3-1.28-box/README.md new file mode 100644 index 00000000..84b854bd --- /dev/null +++ b/main/boards/sp-esp32-s3-1.28-box/README.md @@ -0,0 +1,31 @@ +【产品简介】 +】支持触摸 +】支持充电 +】独特外形设计 +产品链接1：https://spotpear.cn/shop/ESP32-S3-N16R8-AI-DeepSeek-XiaoZhi-XiaGe-Qwen-DouBao-1.28-inch-LCD.html +产品链接2：https://spotpear.cn/shop/ESP32-S3-N16R8-AI-DeepSeek-XiaoZhi-XiaGe-Qwen-DouBao-1.28-inch-Round-LCD-BOX-TouchScreen.html +# 编译配置命令 + +**配置编译目标为 ESP32S3：** + +```bash +idf.py set-target esp32s3 +``` + +**打开 menuconfig：** + +```bash +idf.py menuconfig +``` + +**选择板子：** + +``` +Xiaozhi Assistant -> Board Type -> Spotpear ESP32-S3-1.28-BOX +``` + +**编译：** + +```bash +idf.py build +``` diff --git a/main/boards/sp-esp32-s3-1.28-box/config.h b/main/boards/sp-esp32-s3-1.28-box/config.h new file mode 100644 index 00000000..3dbea9a5 --- /dev/null +++ b/main/boards/sp-esp32-s3-1.28-box/config.h @@ -0,0 +1,52 @@ +#ifndef _BOARD_CONFIG_H_ +#define _BOARD_CONFIG_H_ + +// Movecall Moji configuration + +#include + +#define AUDIO_INPUT_SAMPLE_RATE 24000 +#define AUDIO_OUTPUT_SAMPLE_RATE 24000 + +#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_16 //MCLK +#define AUDIO_I2S_GPIO_WS GPIO_NUM_45 //LRCK +#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_9 //SCLK +#define AUDIO_I2S_GPIO_DIN GPIO_NUM_10 //DOUT +#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_8 //DIN + +#define AUDIO_CODEC_PA_PIN GPIO_NUM_46 +#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_15 +#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_14 +#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR + +#define BUILTIN_LED_GPIO GPIO_NUM_48 +#define BOOT_BUTTON_GPIO GPIO_NUM_0 + + +#define DISPLAY_WIDTH 240 +#define DISPLAY_HEIGHT 240 +#define DISPLAY_MIRROR_X true +#define DISPLAY_MIRROR_Y false +#define DISPLAY_SWAP_XY false + +#define DISPLAY_OFFSET_X 0 +#define DISPLAY_OFFSET_Y 0 + + +#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_42 +#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true + +#define DISPLAY_SPI_SCLK_PIN GPIO_NUM_4 +#define DISPLAY_SPI_MOSI_PIN GPIO_NUM_2 +#define DISPLAY_SPI_CS_PIN GPIO_NUM_5 +#define DISPLAY_SPI_DC_PIN GPIO_NUM_47 +#define DISPLAY_SPI_RESET_PIN GPIO_NUM_38 + +#define TP_PIN_NUM_TP_SDA (GPIO_NUM_11) +#define TP_PIN_NUM_TP_SCL (GPIO_NUM_7) +#define TP_PIN_NUM_TP_RST (GPIO_NUM_6) +#define TP_PIN_NUM_TP_INT (GPIO_NUM_12) + +#define DISPLAY_SPI_SCLK_HZ (40 * 1000 * 1000) + +#endif // _BOARD_CONFIG_H_ diff --git a/main/boards/sp-esp32-s3-1.28-box/config.json b/main/boards/sp-esp32-s3-1.28-box/config.json new file mode 100644 index 00000000..db34c1cd --- /dev/null +++ b/main/boards/sp-esp32-s3-1.28-box/config.json @@ -0,0 +1,9 @@ +{ + "target": "esp32s3", + "builds": [ + { + "name": "sp-esp32-s3-1.28-box", + "sdkconfig_append": [] + } + ] +} diff --git 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 new file mode 100644 index 00000000..218c97b8 --- /dev/null +++ b/main/boards/sp-esp32-s3-1.28-box/sp-esp32-s3-1.28-box.cc @@ -0,0 +1,327 @@ +#include "wifi_board.h" +#include "audio_codecs/es8311_audio_codec.h" +#include "display/lcd_display.h" +#include "application.h" +#include "button.h" +#include "config.h" +#include "iot/thing_manager.h" +#include "led/single_led.h" +#include "assets/lang_config.h" +#include +#include +#include +#include + +#include +#include +#include +#include "system_reset.h" +#include "driver/gpio.h" +#include "driver/spi_master.h" +#include +#include "i2c_device.h" +#include +#include +#include "power_save_timer.h" +#include +#include + +#define TAG "Spotpear_ESP32_S3_1_28_BOX" + +LV_FONT_DECLARE(font_puhui_16_4); +LV_FONT_DECLARE(font_awesome_16_4); + + +class Cst816d : public I2cDevice { +public: + struct TouchPoint_t { + int num = 0; + int x = -1; + int y = -1; + }; + Cst816d(i2c_master_bus_handle_t i2c_bus, uint8_t addr) : I2cDevice(i2c_bus, addr) { + uint8_t chip_id = ReadReg(0xA3); + ESP_LOGI(TAG, "Get chip ID: 0x%02X", chip_id); + read_buffer_ = new uint8_t[6]; + } + + ~Cst816d() { + delete[] read_buffer_; + } + + void UpdateTouchPoint() { + ReadRegs(0x02, read_buffer_, 6); + if (read_buffer_[0] == 0xFF) + { + read_buffer_[0] = 0x00; + } + tp_.num = read_buffer_[0] & 0x01; + tp_.x = ((read_buffer_[1] & 0x0F) << 8) | read_buffer_[2]; + tp_.y = ((read_buffer_[3] & 0x0F) << 8) | read_buffer_[4]; + } + + const TouchPoint_t& GetTouchPoint() { + return tp_; + } + +private: + uint8_t* read_buffer_ = nullptr; + TouchPoint_t tp_; +}; + + +class CustomLcdDisplay : public SpiLcdDisplay { +public: + CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle, + esp_lcd_panel_handle_t panel_handle, + int width, + int height, + int offset_x, + int offset_y, + bool mirror_x, + bool mirror_y, + bool swap_xy) + : 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_obj_set_style_pad_left(status_bar_, LV_HOR_RES * 0.33, 0); + lv_obj_set_style_pad_right(status_bar_, LV_HOR_RES * 0.33, 0); + } +}; + + +class Spotpear_ESP32_S3_1_28_BOX : public WifiBoard { +private: + i2c_master_bus_handle_t codec_i2c_bus_; + i2c_master_bus_handle_t i2c_bus_; + Button boot_button_; + Display* display_; + esp_timer_handle_t touchpad_timer_; + Cst816d* cst816d_; + PowerSaveTimer* power_save_timer_; + esp_lcd_panel_handle_t panel_ = nullptr; + + void InitializePowerSaveTimer() { + rtc_gpio_init(GPIO_NUM_3); + rtc_gpio_set_direction(GPIO_NUM_3, RTC_GPIO_MODE_OUTPUT_ONLY); + rtc_gpio_set_level(GPIO_NUM_3, 1); + + power_save_timer_ = new PowerSaveTimer(-1, 60, 290); + power_save_timer_->OnEnterSleepMode([this]() { + ESP_LOGI(TAG, "Enabling sleep mode"); + display_->SetChatMessage("system", ""); + display_->SetEmotion("sleepy"); + GetBacklight()->SetBrightness(1); + }); + power_save_timer_->OnExitSleepMode([this]() { + display_->SetChatMessage("system", ""); + display_->SetEmotion("neutral"); + GetBacklight()->RestoreBrightness(); + }); + power_save_timer_->OnShutdownRequest([this]() { + ESP_LOGI(TAG, "Shutting down"); + rtc_gpio_set_level(GPIO_NUM_3, 0); + // 启用保持功能，确保睡眠期间电平不变 + rtc_gpio_hold_en(GPIO_NUM_3); + esp_lcd_panel_disp_on_off(panel_, false); //关闭显示 + esp_deep_sleep_start(); + }); + power_save_timer_->SetEnabled(true); + } + + void InitializeCodecI2c() { + // Initialize I2C peripheral + i2c_master_bus_config_t i2c_bus_cfg = { + .i2c_port = I2C_NUM_0, + .sda_io_num = AUDIO_CODEC_I2C_SDA_PIN, + .scl_io_num = AUDIO_CODEC_I2C_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(&i2c_bus_cfg, &codec_i2c_bus_)); + } + + void InitializeCodecI2c_Touch() { + // Initialize I2C peripheral + i2c_master_bus_config_t i2c_bus_cfg = { + .i2c_port = I2C_NUM_1, + .sda_io_num = TP_PIN_NUM_TP_SDA, + .scl_io_num = TP_PIN_NUM_TP_SCL, + .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(&i2c_bus_cfg, &i2c_bus_)); + } + + + static void touchpad_timer_callback(void* arg) { + auto& board = (Spotpear_ESP32_S3_1_28_BOX&)Board::GetInstance(); + auto touchpad = board.GetTouchpad(); + static bool was_touched = false; + static int64_t touch_start_time = 0; + const int64_t TOUCH_THRESHOLD_MS = 500; // 触摸时长阈值，超过500ms视为长按 + + touchpad->UpdateTouchPoint(); + auto touch_point = touchpad->GetTouchPoint(); + + // 检测触摸开始 + if (touch_point.num > 0 && !was_touched) { + was_touched = true; + touch_start_time = esp_timer_get_time() / 1000; // 转换为毫秒 + } + // 检测触摸释放 + else if (touch_point.num == 0 && was_touched) { + was_touched = false; + int64_t touch_duration = (esp_timer_get_time() / 1000) - touch_start_time; + + // 只有短触才触发 + if (touch_duration < TOUCH_THRESHOLD_MS) { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting && + !WifiStation::GetInstance().IsConnected()) { + board.ResetWifiConfiguration(); + } + app.ToggleChatState(); + } + } + } + + void InitializeCst816DTouchPad() { + ESP_LOGI(TAG, "Init Cst816D"); + cst816d_ = new Cst816d(i2c_bus_, 0x15); + + // 创建定时器，10ms 间隔 + esp_timer_create_args_t timer_args = { + .callback = touchpad_timer_callback, + .arg = NULL, + .dispatch_method = ESP_TIMER_TASK, + .name = "touchpad_timer", + .skip_unhandled_events = true, + }; + + ESP_ERROR_CHECK(esp_timer_create(&timer_args, &touchpad_timer_)); + ESP_ERROR_CHECK(esp_timer_start_periodic(touchpad_timer_, 10 * 1000)); // 10ms = 10000us + } + + // SPI初始化 + void InitializeSpi() { + ESP_LOGI(TAG, "Initialize SPI bus"); + spi_bus_config_t buscfg = GC9A01_PANEL_BUS_SPI_CONFIG(DISPLAY_SPI_SCLK_PIN, DISPLAY_SPI_MOSI_PIN, + DISPLAY_WIDTH * DISPLAY_HEIGHT * sizeof(uint16_t)); + ESP_ERROR_CHECK(spi_bus_initialize(SPI3_HOST, &buscfg, SPI_DMA_CH_AUTO)); + } + + // GC9A01初始化 + void InitializeGc9a01Display() { + ESP_LOGI(TAG, "Init GC9A01 display"); + ESP_LOGI(TAG, "Install panel IO"); + esp_lcd_panel_io_handle_t io_handle = NULL; + esp_lcd_panel_io_spi_config_t io_config = GC9A01_PANEL_IO_SPI_CONFIG(DISPLAY_SPI_CS_PIN, DISPLAY_SPI_DC_PIN, 0, NULL); + io_config.pclk_hz = DISPLAY_SPI_SCLK_HZ; + ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi(SPI3_HOST, &io_config, &io_handle)); + + ESP_LOGI(TAG, "Install GC9A01 panel driver"); + esp_lcd_panel_handle_t panel_handle = NULL; + esp_lcd_panel_dev_config_t panel_config = {}; + panel_config.reset_gpio_num = DISPLAY_SPI_RESET_PIN; // Set to -1 if not use + panel_config.rgb_endian = LCD_RGB_ENDIAN_BGR; //LCD_RGB_ENDIAN_RGB; + panel_config.bits_per_pixel = 16; + + ESP_ERROR_CHECK(esp_lcd_new_panel_gc9a01(io_handle, &panel_config, &panel_handle)); + ESP_ERROR_CHECK(esp_lcd_panel_reset(panel_handle)); + ESP_ERROR_CHECK(esp_lcd_panel_init(panel_handle)); + ESP_ERROR_CHECK(esp_lcd_panel_invert_color(panel_handle, true)); + ESP_ERROR_CHECK(esp_lcd_panel_mirror(panel_handle, true, false)); + ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel_handle, true)); + + display_ = new CustomLcdDisplay(io_handle, panel_handle, + DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY); + + } + + void InitializeButtons() { + boot_button_.OnClick([this]() { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) { + ResetWifiConfiguration(); + } + app.ToggleChatState(); + }); + } + + // 物联网初始化，添加对 AI 可见设备 + void InitializeIot() { + auto& thing_manager = iot::ThingManager::GetInstance(); + thing_manager.AddThing(iot::CreateThing("Speaker")); + thing_manager.AddThing(iot::CreateThing("Screen")); + } + +public: + Spotpear_ESP32_S3_1_28_BOX() : boot_button_(BOOT_BUTTON_GPIO) { + + gpio_set_direction(TP_PIN_NUM_TP_INT, GPIO_MODE_INPUT); + int level = gpio_get_level(TP_PIN_NUM_TP_INT); + if (level == 1) { + InitializeCodecI2c_Touch(); + InitializeCst816DTouchPad(); + } + InitializePowerSaveTimer(); + InitializeCodecI2c(); + InitializeSpi(); + InitializeGc9a01Display(); + InitializeButtons(); + InitializeIot(); + GetBacklight()->RestoreBrightness(); + } + + + virtual Led* GetLed() override { + static SingleLed led(BUILTIN_LED_GPIO); + return &led; + } + + virtual Display* GetDisplay() override { + return display_; + } + + virtual Backlight* GetBacklight() override { + static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT); + return &backlight; + } + + virtual AudioCodec* GetAudioCodec() override { + static Es8311AudioCodec audio_codec(codec_i2c_bus_, I2C_NUM_0, AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE, + AUDIO_I2S_GPIO_MCLK, AUDIO_I2S_GPIO_BCLK, AUDIO_I2S_GPIO_WS, AUDIO_I2S_GPIO_DOUT, AUDIO_I2S_GPIO_DIN, + AUDIO_CODEC_PA_PIN, AUDIO_CODEC_ES8311_ADDR); + return &audio_codec; + } + + Cst816d* GetTouchpad() { + return cst816d_; + } + + virtual void SetPowerSaveMode(bool enabled) override { + if (!enabled) { + power_save_timer_->WakeUp(); + } + WifiBoard::SetPowerSaveMode(enabled); + } +}; + +DECLARE_BOARD(Spotpear_ESP32_S3_1_28_BOX); diff --git a/main/boards/sp-esp32-s3-1.54-muma/power_manager.h b/main/boards/sp-esp32-s3-1.54-muma/power_manager.h index 0e99bfe3..2df53a1e 100644 --- a/main/boards/sp-esp32-s3-1.54-muma/power_manager.h +++ b/main/boards/sp-esp32-s3-1.54-muma/power_manager.h @@ -1,107 +1,118 @@ -#ifndef __POWER_MANAGER_H__ -#define __POWER_MANAGER_H__ +#pragma once +#include +#include +#include #include #include -#include -#include + class PowerManager { private: - // 电池电量区间-分压电阻为2个100k - static constexpr struct { - uint16_t adc; - uint8_t level; - } BATTERY_LEVELS[] = {{1980, 0}, {2519, 100}}; - static constexpr size_t BATTERY_LEVELS_COUNT = 2; - static constexpr size_t ADC_VALUES_COUNT = 10; + esp_timer_handle_t timer_handle_; + std::function on_charging_status_changed_; + std::function on_low_battery_status_changed_; - esp_timer_handle_t timer_handle_ = nullptr; - gpio_num_t charging_pin_; - gpio_num_t bat_led_pin_; - adc_unit_t adc_unit_; - adc_channel_t adc_channel_; - uint16_t adc_values_[ADC_VALUES_COUNT]; - size_t adc_values_index_ = 0; - size_t adc_values_count_ = 0; - uint8_t battery_level_ = 100; + gpio_num_t charging_pin_ = GPIO_NUM_41; + std::vector adc_values_; + uint32_t battery_level_ = 0; bool is_charging_ = false; - - static constexpr uint8_t MAX_CHANGE_COUNT = 8; - static constexpr uint32_t TIME_LIMIT = 2000000; // 2 seconds in microseconds - - uint8_t change_count_ = 0; // 记录状态变化次数 - uint64_t last_change_time_ = 0; // 最后一次状态变化的时间戳（微秒） + bool is_low_battery_ = false; + int ticks_ = 0; + const int kBatteryAdcInterval = 60; + const int kBatteryAdcDataCount = 3; + const int kLowBatteryLevel = 20; adc_oneshot_unit_handle_t adc_handle_; void CheckBatteryStatus() { - uint64_t current_time = esp_timer_get_time(); // 获取当前时间（微秒） - - // 如果时间间隔超过2秒，则重置状态变化计数 - if (current_time - last_change_time_ > TIME_LIMIT) { - change_count_ = 0; + // Get charging status + bool new_charging_status = gpio_get_level(charging_pin_) == 1; + if (new_charging_status != is_charging_) { + is_charging_ = new_charging_status; + if (on_charging_status_changed_) { + on_charging_status_changed_(is_charging_); + } + ReadBatteryAdcData(); + return; } - if (change_count_ < MAX_CHANGE_COUNT) { - bool new_is_charging = gpio_get_level(bat_led_pin_) != 0; // 检查LED引脚状态 - - // 判断充电引脚状态 - if (new_is_charging) { - new_is_charging = gpio_get_level(charging_pin_) == 1; - } - - // 如果状态有变化 - if (new_is_charging != is_charging_) { - is_charging_ = new_is_charging; - change_count_++; // 增加变化次数 - last_change_time_ = current_time; // 更新最后变化时间 - } + // 如果电池电量数据不足，则读取电池电量数据 + if (adc_values_.size() < kBatteryAdcDataCount) { + ReadBatteryAdcData(); + return; } - ReadBatteryAdcData(); + // 如果电池电量数据充足，则每 kBatteryAdcInterval 个 tick 读取一次电池电量数据 + ticks_++; + if (ticks_ % kBatteryAdcInterval == 0) { + ReadBatteryAdcData(); + } } + void ReadBatteryAdcData() { int adc_value; - ESP_ERROR_CHECK(adc_oneshot_read(adc_handle_, adc_channel_, &adc_value)); + ESP_ERROR_CHECK(adc_oneshot_read(adc_handle_, ADC_CHANNEL_0, &adc_value)); - adc_values_[adc_values_index_] = adc_value; - adc_values_index_ = (adc_values_index_ + 1) % ADC_VALUES_COUNT; - if (adc_values_count_ < ADC_VALUES_COUNT) { - adc_values_count_++; + // 将 ADC 值添加到队列中 + adc_values_.push_back(adc_value); + if (adc_values_.size() > kBatteryAdcDataCount) { + adc_values_.erase(adc_values_.begin()); } - uint32_t average_adc = 0; - for (size_t i = 0; i < adc_values_count_; i++) { - average_adc += adc_values_[i]; + for (auto value : adc_values_) { + average_adc += value; } - average_adc /= adc_values_count_; + average_adc /= adc_values_.size(); - CalculateBatteryLevel(average_adc); + // 定义电池电量区间 + const struct { + uint16_t adc; + uint8_t level; + } levels[] = { + {1980, 0}, + {2081, 20}, + {2163, 40}, + {2250, 60}, + {2340, 80}, + {2480, 100} + }; - - // ESP_LOGI("PowerManager", "ADC值: %d 平均值: %ld 电量: %u%%", adc_value, average_adc, - // battery_level_); - } - - void CalculateBatteryLevel(uint32_t average_adc) { - if (average_adc <= BATTERY_LEVELS[0].adc) { + // 低于最低值时 + if (average_adc < levels[0].adc) { battery_level_ = 0; - } else if (average_adc >= BATTERY_LEVELS[BATTERY_LEVELS_COUNT - 1].adc) { + } + // 高于最高值时 + else if (average_adc >= levels[5].adc) { battery_level_ = 100; } else { - float ratio = static_cast(average_adc - BATTERY_LEVELS[0].adc) / - (BATTERY_LEVELS[1].adc - BATTERY_LEVELS[0].adc); - battery_level_ = ratio * 100; + // 线性插值计算中间值 + for (int i = 0; i < 5; i++) { + if (average_adc >= levels[i].adc && average_adc < levels[i+1].adc) { + float ratio = static_cast(average_adc - levels[i].adc) / (levels[i+1].adc - levels[i].adc); + battery_level_ = levels[i].level + ratio * (levels[i+1].level - levels[i].level); + break; + } + } } + + // Check low battery status + if (adc_values_.size() >= kBatteryAdcDataCount) { + bool new_low_battery_status = battery_level_ <= kLowBatteryLevel; + if (new_low_battery_status != is_low_battery_) { + is_low_battery_ = new_low_battery_status; + if (on_low_battery_status_changed_) { + on_low_battery_status_changed_(is_low_battery_); + } + } + } + + ESP_LOGI("PowerManager", "ADC value: %d average: %ld level: %ld", adc_value, average_adc, battery_level_); } public: - PowerManager(gpio_num_t charging_pin, gpio_num_t bat_led_pin, adc_unit_t adc_unit = ADC_UNIT_2, - adc_channel_t adc_channel = ADC_CHANNEL_3) - : charging_pin_(charging_pin), bat_led_pin_(bat_led_pin), adc_unit_(adc_unit), adc_channel_(adc_channel) { - - // 配置充电引脚 + PowerManager(gpio_num_t pin) : charging_pin_(pin) { + // 初始化充电引脚 gpio_config_t io_conf = {}; io_conf.intr_type = GPIO_INTR_DISABLE; io_conf.mode = GPIO_MODE_INPUT; @@ -110,33 +121,23 @@ public: io_conf.pull_up_en = GPIO_PULLUP_ENABLE; gpio_config(&io_conf); - // 配置状态引脚 - io_conf.pull_up_en = GPIO_PULLUP_DISABLE; - io_conf.pin_bit_mask = (1ULL << bat_led_pin_); - gpio_config(&io_conf); - - // 定时器配置 + // 创建电池电量检查定时器 esp_timer_create_args_t timer_args = { - .callback = - [](void* arg) { - PowerManager* self = static_cast(arg); - self->CheckBatteryStatus(); - }, + .callback = [](void* arg) { + PowerManager* self = static_cast(arg); + self->CheckBatteryStatus(); + }, .arg = this, .dispatch_method = ESP_TIMER_TASK, .name = "battery_check_timer", .skip_unhandled_events = true, }; ESP_ERROR_CHECK(esp_timer_create(&timer_args, &timer_handle_)); - ESP_ERROR_CHECK(esp_timer_start_periodic(timer_handle_, 500000)); // 1秒 + ESP_ERROR_CHECK(esp_timer_start_periodic(timer_handle_, 100000)); - // 初始化ADC - InitializeAdc(); - } - - void InitializeAdc() { + // 初始化 ADC adc_oneshot_unit_init_cfg_t init_config = { - .unit_id = adc_unit_, + .unit_id = ADC_UNIT_1, .ulp_mode = ADC_ULP_MODE_DISABLE, }; ESP_ERROR_CHECK(adc_oneshot_new_unit(&init_config, &adc_handle_)); @@ -145,8 +146,7 @@ public: .atten = ADC_ATTEN_DB_12, .bitwidth = ADC_BITWIDTH_12, }; - - ESP_ERROR_CHECK(adc_oneshot_config_channel(adc_handle_, adc_channel_, &chan_config)); + ESP_ERROR_CHECK(adc_oneshot_config_channel(adc_handle_, ADC_CHANNEL_0, &chan_config)); } ~PowerManager() { @@ -159,8 +159,28 @@ public: } } - bool IsCharging() { return is_charging_; } + bool IsCharging() { + // 如果电量已经满了，则不再显示充电中 + if (battery_level_ == 100) { + return false; + } + return is_charging_; + } - uint8_t GetBatteryLevel() { return battery_level_; } + bool IsDischarging() { + // 没有区分充电和放电，所以直接返回相反状态 + return !is_charging_; + } + + uint8_t GetBatteryLevel() { + return battery_level_; + } + + void OnLowBatteryStatusChanged(std::function callback) { + on_low_battery_status_changed_ = callback; + } + + void OnChargingStatusChanged(std::function callback) { + on_charging_status_changed_ = callback; + } }; -#endif // __POWER_MANAGER_H__ diff --git 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 index 0c9ce790..cac7ead1 100644 --- 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 @@ -9,11 +9,12 @@ #include "assets/lang_config.h" #include #include -#include #include #include "system_reset.h" + #include #include + #include "driver/gpio.h" #include "driver/spi_master.h" #include @@ -22,6 +23,9 @@ #include "i2c_device.h" #include #include "power_manager.h" +#include "power_save_timer.h" +#include +#include #define TAG "Spotpear_esp32_s3_lcd_1_54" @@ -73,11 +77,47 @@ private: esp_timer_handle_t touchpad_timer_; Cst816d* cst816d_; esp_io_expander_handle_t io_expander_ = NULL; - PowerManager* power_manager_; + esp_lcd_panel_handle_t panel_ = nullptr; + PowerManager* power_manager_; + PowerSaveTimer* power_save_timer_; void InitializePowerManager() { - power_manager_ = - new PowerManager(POWER_CHARGE_DETECT_PIN, POWER_CHARGE_LED_PIN, POWER_ADC_UNIT, POWER_ADC_CHANNEL); + power_manager_ = new PowerManager(GPIO_NUM_41); + power_manager_->OnChargingStatusChanged([this](bool is_charging) { + if (is_charging) { + power_save_timer_->SetEnabled(false); + } else { + power_save_timer_->SetEnabled(true); + } + }); + } + + void InitializePowerSaveTimer() { + rtc_gpio_init(GPIO_NUM_3); + rtc_gpio_set_direction(GPIO_NUM_3, RTC_GPIO_MODE_OUTPUT_ONLY); + rtc_gpio_set_level(GPIO_NUM_3, 1); + + power_save_timer_ = new PowerSaveTimer(-1, 60, 300); + power_save_timer_->OnEnterSleepMode([this]() { + ESP_LOGI(TAG, "Enabling sleep mode"); + display_->SetChatMessage("system", ""); + display_->SetEmotion("sleepy"); + GetBacklight()->SetBrightness(1); + }); + power_save_timer_->OnExitSleepMode([this]() { + display_->SetChatMessage("system", ""); + display_->SetEmotion("neutral"); + GetBacklight()->RestoreBrightness(); + }); + power_save_timer_->OnShutdownRequest([this]() { + ESP_LOGI(TAG, "Shutting down"); + rtc_gpio_set_level(GPIO_NUM_3, 0); + // 启用保持功能，确保睡眠期间电平不变 + rtc_gpio_hold_en(GPIO_NUM_3); + esp_lcd_panel_disp_on_off(panel_, false); //关闭显示 + esp_deep_sleep_start(); + }); + power_save_timer_->SetEnabled(true); } void InitializeCodecI2c() { @@ -252,6 +292,7 @@ public: InitializeCodecI2c_Touch(); InitializeCst816DTouchPad(); } + InitializePowerSaveTimer(); InitializeCodecI2c(); InitializeSpi(); InitializePowerManager(); @@ -286,12 +327,25 @@ public: Cst816d* GetTouchpad() { return cst816d_; } + virtual bool GetBatteryLevel(int& level, bool& charging, bool& discharging) override { + static bool last_discharging = false; charging = power_manager_->IsCharging(); - discharging = !charging; + discharging = power_manager_->IsDischarging(); + if (discharging != last_discharging) { + power_save_timer_->SetEnabled(discharging); + last_discharging = discharging; + } level = power_manager_->GetBatteryLevel(); return true; } + + virtual void SetPowerSaveMode(bool enabled) override { + if (!enabled) { + power_save_timer_->WakeUp(); + } + WifiBoard::SetPowerSaveMode(enabled); + } }; DECLARE_BOARD(Spotpear_esp32_s3_lcd_1_54);