diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index d04fa5c..46cd3a3 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -387,6 +387,18 @@ elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_3_49) set(LVGL_TEXT_FONT font_puhui_basic_30_4) set(LVGL_ICON_FONT font_awesome_30_4) set(DEFAULT_EMOJI_COLLECTION twemoji_64) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_54) + set(MANUFACTURER "waveshare") + set(BOARD_TYPE "esp32-s3-touch-lcd-1.54") + set(BUILTIN_TEXT_FONT font_puhui_basic_20_4) + set(BUILTIN_ICON_FONT font_awesome_20_4) + set(DEFAULT_EMOJI_COLLECTION twemoji_64) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_LCD_0_85) + set(MANUFACTURER "waveshare") + set(BOARD_TYPE "esp32-s3-lcd-0.85") + set(BUILTIN_TEXT_FONT font_puhui_basic_16_4) + set(BUILTIN_ICON_FONT font_awesome_16_4) + set(DEFAULT_EMOJI_COLLECTION twemoji_32) elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_C6_LCD_1_69) set(MANUFACTURER "waveshare") set(BOARD_TYPE "esp32-c6-lcd-1.69") diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 98272b9..b4daf42 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -344,6 +344,12 @@ choice BOARD_TYPE config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_3_5B bool "Waveshare ESP32-S3-Touch-LCD-3.5B" depends on IDF_TARGET_ESP32S3 + config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_54 + bool "Waveshare ESP32-S3-Touch-LCD-1.54" + depends on IDF_TARGET_ESP32S3 + config BOARD_TYPE_WAVESHARE_ESP32_S3_LCD_0_85 + bool "Waveshare ESP32-S3-LCD-0.85" + depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_WAVESHARE_ESP32_P4_NANO bool "Waveshare ESP32-P4-NANO" depends on IDF_TARGET_ESP32P4 @@ -762,7 +768,7 @@ config USE_DEVICE_AEC || BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_3_4C || BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4C || BOARD_TYPE_ESP_S3_LCD_EV_Board_2 || BOARD_TYPE_YUNLIAO_S3 \ || BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7 || BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_8 || BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_10_1 \ || BOARD_TYPE_ESP_VOCAT || BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_3_49 || BOARD_TYPE_WAVESHARE_ESP32_S3_RLCD_4_2 || BOARD_TYPE_ZHENGCHEN_CAM || BOARD_TYPE_ZHENGCHEN_CAM_ML307 \ - || BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3C) + || BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3C || BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_54 || BOARD_TYPE_WAVESHARE_ESP32_S3_LCD_0_85) help To work properly, device-side AEC requires a clean output reference path from the speaker signal and physical acoustic isolation between the microphone and speaker. diff --git a/main/boards/waveshare/esp32-s3-lcd-0.85/README.md b/main/boards/waveshare/esp32-s3-lcd-0.85/README.md new file mode 100644 index 0000000..4fa0058 --- /dev/null +++ b/main/boards/waveshare/esp32-s3-lcd-0.85/README.md @@ -0,0 +1,60 @@ +# 产品链接 + +[微雪电子 ESP32-S3-LCD-0.85](https://www.waveshare.net/shop/ESP32-S3-LCD-0.85.htm) + +# 编译配置命令 + +**克隆工程** + +```bash +git clone https://github.com/78/xiaozhi-esp32.git +``` + +**进入工程** + +```bash +cd xiaozhi-esp32 +``` + +**配置编译目标为 ESP32C6** + +```bash +idf.py set-target esp32S3 +``` + +**打开 menuconfig** + +```bash +idf.py menuconfig +``` + +**选择板子** + +```bash +Xiaozhi Assistant -> Board Type -> Waveshare ESP32-S3-LCD-0.85 +``` + +**修改 flash 大小：** + +``` +Serial flasher config -> Flash size -> 8 MB +``` + +**修改分区表：** + +``` +Partition Table -> Custom partition CSV file -> partitions/v2/8m.csv +``` + +**编译** + +```ba +idf.py build +``` + +**下载并打开串口终端** + +```bash +idf.py build flash monitor +``` + diff --git a/main/boards/waveshare/esp32-s3-lcd-0.85/config.h b/main/boards/waveshare/esp32-s3-lcd-0.85/config.h new file mode 100644 index 0000000..8a0e96b --- /dev/null +++ b/main/boards/waveshare/esp32-s3-lcd-0.85/config.h @@ -0,0 +1,56 @@ +#ifndef _BOARD_CONFIG_H_ +#define _BOARD_CONFIG_H_ + +#include +#include + +#define AUDIO_INPUT_SAMPLE_RATE 24000 +#define AUDIO_OUTPUT_SAMPLE_RATE 24000 + +#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_8 +#define AUDIO_I2S_GPIO_WS GPIO_NUM_10 +#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_9 +#define AUDIO_I2S_GPIO_DIN GPIO_NUM_11 +#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_12 + +#define AUDIO_CODEC_PA_PIN GPIO_NUM_7 +#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_42 +#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_41 +#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR +#define AUDIO_CODEC_ES7210_ADDR ES7210_CODEC_DEFAULT_ADDR + +#define BUILTIN_LED_GPIO GPIO_NUM_48 +#define PWR_BUTTON_GPIO GPIO_NUM_5 +#define VOLUME_UP_BUTTON_GPIO GPIO_NUM_4 +#define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_0 + +#define DISPLAY_SPI_MODE 3 +#define DISPLAY_CS_PIN GPIO_NUM_21 +#define DISPLAY_MOSI_PIN GPIO_NUM_39 +#define DISPLAY_MISO_PIN GPIO_NUM_NC +#define DISPLAY_CLK_PIN GPIO_NUM_38 +#define DISPLAY_DC_PIN GPIO_NUM_45 +#define DISPLAY_RST_PIN GPIO_NUM_40 + +#define TOOUCH_INT_PIN GPIO_NUM_48 +#define TOOUCH_RST_PIN GPIO_NUM_47 + +#define BATTERY_EN_PIN GPIO_NUM_2 +#define BATTERY_ADC_PIN GPIO_NUM_1 +#define BATTERY_CHARGING_PIN GPIO_NUM_3 + +#define DISPLAY_WIDTH 128 +#define DISPLAY_HEIGHT 128 +#define DISPLAY_MIRROR_X true +#define DISPLAY_MIRROR_Y true +#define DISPLAY_SWAP_XY false +#define DISPLAY_RGB_ORDER LCD_RGB_ELEMENT_ORDER_BGR +#define DISPLAY_INVERT_COLOR true + +#define DISPLAY_OFFSET_X 2 +#define DISPLAY_OFFSET_Y 1 + +#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_46 +#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false + +#endif // _BOARD_CONFIG_H_ diff --git a/main/boards/waveshare/esp32-s3-lcd-0.85/config.json b/main/boards/waveshare/esp32-s3-lcd-0.85/config.json new file mode 100644 index 0000000..6520b37 --- /dev/null +++ b/main/boards/waveshare/esp32-s3-lcd-0.85/config.json @@ -0,0 +1,15 @@ +{ + "manufacturer": "waveshare", + "target": "esp32s3", + "builds": [ + { + "name": "esp32-s3-lcd-0.85", + "sdkconfig_append": [ + "CONFIG_USE_DEVICE_AEC=y", + "CONFIG_USE_WECHAT_MESSAGE_STYLE=n", + "CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y", + "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/8m.csv\"" + ] + } + ] +} \ No newline at end of file diff --git a/main/boards/waveshare/esp32-s3-lcd-0.85/esp32-s3-lcd-0.85.cc b/main/boards/waveshare/esp32-s3-lcd-0.85/esp32-s3-lcd-0.85.cc new file mode 100644 index 0000000..6af8334 --- /dev/null +++ b/main/boards/waveshare/esp32-s3-lcd-0.85/esp32-s3-lcd-0.85.cc @@ -0,0 +1,311 @@ +#include "wifi_board.h" +#include "codecs/box_audio_codec.h" +#include "display/lcd_display.h" +#include "system_reset.h" +#include "application.h" +#include "button.h" +#include "config.h" +#include "mcp_server.h" +#include +#include "i2c_device.h" +#include +#include +#include +#include +#include +#include +#include +#include "power_save_timer.h" +#include "assets/lang_config.h" +#include +#include "driver/gpio.h" +#include "iot_button.h" +#include "power_manager.h" +#include "led/circular_strip.h" +#include "led_strip_control.h" + +#define TAG "waveshare_lcd_0_85" + + +class CustomButton: public Button{ +public: + void OnPressDownDel(void) { + if (button_handle_ == nullptr) { + return; + } + on_press_down_ = NULL; + iot_button_unregister_cb(button_handle_, BUTTON_PRESS_DOWN, nullptr); + } + void OnPressUpDel(void) { + if (button_handle_ == nullptr) { + return; + } + on_press_up_ = NULL; + iot_button_unregister_cb(button_handle_, BUTTON_PRESS_UP, nullptr); + } +}; + + +class CustomBoard : public WifiBoard { +private: + CustomButton pwr_button_; + CustomButton volume_up_button_; + CustomButton volume_down_button_; + i2c_master_bus_handle_t i2c_bus_; + CircularStrip* led_strip_; + LcdDisplay* display_; + PowerManager* power_manager_ = nullptr; + PowerSaveTimer* power_save_timer_ = nullptr; + + void InitializePowerManager() { + power_manager_ = new PowerManager(BATTERY_CHARGING_PIN, BATTERY_ADC_PIN, BATTERY_EN_PIN); + power_manager_->PowerON(); + } + + void InitializePowerSaveTimer() { + power_save_timer_ = new PowerSaveTimer(-1, 60, 300); + power_save_timer_->OnEnterSleepMode([this]() { + ESP_LOGI(TAG, "Enabling sleep mode"); + auto display = GetDisplay(); + display->SetChatMessage("system", ""); + display->SetEmotion("sleepy"); + GetBacklight()->SetBrightness(20); + }); + power_save_timer_->OnExitSleepMode([this]() { + auto display = GetDisplay(); + display->SetChatMessage("system", ""); + display->SetEmotion("neutral"); + GetBacklight()->RestoreBrightness(); + }); + power_save_timer_->OnShutdownRequest([this]() { + power_manager_->PowerOff(); + }); + power_save_timer_->SetEnabled(true); + } + + void InitializeI2c() { + // Initialize I2C peripheral + i2c_master_bus_config_t i2c_bus_cfg = { + .i2c_port = (i2c_port_t)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, &i2c_bus_)); + } + + void InitializeSpi() { + ESP_LOGI(TAG, "Initialize QSPI bus"); + spi_bus_config_t buscfg = {}; + buscfg.mosi_io_num = DISPLAY_MOSI_PIN; + buscfg.miso_io_num = DISPLAY_MISO_PIN; + buscfg.sclk_io_num = DISPLAY_CLK_PIN; + buscfg.quadwp_io_num = GPIO_NUM_NC; + buscfg.quadhd_io_num = GPIO_NUM_NC; + buscfg.max_transfer_sz = DISPLAY_WIDTH * DISPLAY_HEIGHT * sizeof(uint16_t); + ESP_ERROR_CHECK(spi_bus_initialize(SPI3_HOST, &buscfg, SPI_DMA_CH_AUTO)); + } + + void InitializeLed() { + led_strip_ = new CircularStrip(BUILTIN_LED_GPIO, 8); + new LedStripControl(led_strip_); + } + + void InitializeLcdDisplay() { + esp_lcd_panel_io_handle_t panel_io = nullptr; + esp_lcd_panel_handle_t panel = nullptr; + // 液晶屏控制IO初始化 + ESP_LOGI(TAG, "Install panel IO"); + esp_lcd_panel_io_spi_config_t io_config = {}; + io_config.cs_gpio_num = DISPLAY_CS_PIN; + io_config.dc_gpio_num = DISPLAY_DC_PIN; + io_config.spi_mode = DISPLAY_SPI_MODE; + io_config.pclk_hz = 40 * 1000 * 1000; + io_config.trans_queue_depth = 10; + io_config.lcd_cmd_bits = 8; + io_config.lcd_param_bits = 8; + ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi(SPI3_HOST, &io_config, &panel_io)); + + + // 初始化液晶屏驱动芯片 + ESP_LOGI(TAG, "Install LCD driver"); + esp_lcd_panel_dev_config_t panel_config = {}; + panel_config.reset_gpio_num = DISPLAY_RST_PIN; + panel_config.rgb_ele_order = DISPLAY_RGB_ORDER; + panel_config.bits_per_pixel = 16; + + ESP_ERROR_CHECK(esp_lcd_new_panel_st7789(panel_io, &panel_config, &panel)); + + + esp_lcd_panel_reset(panel); + + esp_lcd_panel_init(panel); + 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_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY); + } + + void InitializeButtons() { + + pwr_button_.OnPressUp([this]() { + pwr_button_.OnClick([this]() { + auto& app = Application::GetInstance(); + app.ToggleChatState(); + }); + pwr_button_.OnLongPress([this]() { + printf("Power button long press\n"); + if (power_manager_ != nullptr){ + power_manager_->PowerOff(); + } + }); + + pwr_button_.OnDoubleClick([this]() { + static uint8_t brightness_last = 0; + auto backlight = Board::GetInstance().GetBacklight(); + if (backlight->brightness() == 0) { + brightness_last = 0; + if (brightness_last == 0) { + backlight->SetBrightness(50, true); + } else { + backlight->SetBrightness(brightness_last, true); + } + } else { + brightness_last = backlight->brightness(); + backlight->SetBrightness(0); + } + }); + pwr_button_.OnMultipleClick([this]() { + EnterWifiConfigMode(); + }, 3); + pwr_button_.OnPressUpDel(); + }); + + volume_up_button_.OnClick([this]() { + auto codec = Board::GetInstance().GetAudioCodec(); + auto volume = codec->output_volume() + 10; + if (volume > 100) { + volume = 100; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume/10)); + }); + + volume_up_button_.OnLongPress([this]() { + Board::GetInstance().GetAudioCodec()->SetOutputVolume(100); + GetDisplay()->ShowNotification(Lang::Strings::MAX_VOLUME); + }); + + volume_down_button_.OnClick([this]() { + auto codec = Board::GetInstance().GetAudioCodec(); + auto volume = codec->output_volume() - 10; + if (volume < 0) { + volume = 0; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume/10)); + }); + + volume_down_button_.OnLongPress([this]() { + Board::GetInstance().GetAudioCodec()->SetOutputVolume(0); + GetDisplay()->ShowNotification(Lang::Strings::MUTED); + }); +#if CONFIG_USE_DEVICE_AEC + volume_down_button_.OnDoubleClick([this]() { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateIdle) { + app.SetAecMode(app.GetAecMode() == kAecOff ? kAecOnDeviceSide : kAecOff); + } + }); +#endif + } + + // 初始化工具 + void InitializeTools() { + auto &mcp_server = McpServer::GetInstance(); + mcp_server.AddTool("self.system.reconfigure_wifi", + "Reboot the device 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: + CustomBoard() : + pwr_button_(PWR_BUTTON_GPIO), + volume_up_button_(VOLUME_UP_BUTTON_GPIO), + volume_down_button_(VOLUME_DOWN_BUTTON_GPIO) { + InitializePowerManager(); + InitializePowerSaveTimer(); + InitializeI2c(); + InitializeSpi(); + InitializeLcdDisplay(); + InitializeButtons(); + InitializeLed(); + InitializeTools(); + GetBacklight()->RestoreBrightness(); + } + + virtual AudioCodec* GetAudioCodec() override { + static BoxAudioCodec audio_codec( + i2c_bus_, + 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, + AUDIO_CODEC_ES7210_ADDR, + true); + return &audio_codec; + } + + virtual Led* GetLed() override { + return led_strip_; + } + + virtual Display* GetDisplay() override { + return display_; + } + + virtual Backlight* GetBacklight() override { + static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT); + return &backlight; + } + + virtual bool GetBatteryLevel(int &level, bool& charging, bool& discharging) override { + static bool last_discharging = false; + charging = power_manager_->IsCharging(); + discharging = power_manager_->IsDischarging(); + if (discharging != last_discharging) { + power_save_timer_->SetEnabled(discharging); + last_discharging = discharging; + } + + level = power_manager_->GetBatteryLevel(); + return true; + } + + virtual void SetPowerSaveLevel(PowerSaveLevel level) override { + if (level != PowerSaveLevel::LOW_POWER) { + power_save_timer_->WakeUp(); + } + WifiBoard::SetPowerSaveLevel(level); + } +}; + +DECLARE_BOARD(CustomBoard); diff --git a/main/boards/waveshare/esp32-s3-lcd-0.85/led_strip_control.cc b/main/boards/waveshare/esp32-s3-lcd-0.85/led_strip_control.cc new file mode 100644 index 0000000..e2b0b83 --- /dev/null +++ b/main/boards/waveshare/esp32-s3-lcd-0.85/led_strip_control.cc @@ -0,0 +1,130 @@ +#include "led_strip_control.h" +#include "settings.h" +#include "mcp_server.h" +#include + +#define TAG "LedStripControl" + + +int LedStripControl::LevelToBrightness(int level) const { + if (level < 0) level = 0; + if (level > 8) level = 8; + return (1 << level) - 1; // 2^n - 1 +} + +StripColor LedStripControl::RGBToColor(int red, int green, int blue) { + if (red < 0) red = 0; + if (red > 255) red = 255; + if (green < 0) green = 0; + if (green > 255) green = 255; + if (blue < 0) blue = 0; + if (blue > 255) blue = 255; + return {static_cast(red), static_cast(green), static_cast(blue)}; +} + +LedStripControl::LedStripControl(CircularStrip* led_strip) + : led_strip_(led_strip) { + // 从设置中读取亮度等级 + Settings settings("led_strip"); + brightness_level_ = settings.GetInt("brightness", 4); // 默认等级4 + led_strip_->SetBrightness(LevelToBrightness(brightness_level_), 4); + + auto& mcp_server = McpServer::GetInstance(); + mcp_server.AddTool("self.led_strip.get_brightness", + "Get the brightness of the led strip (0-8)", + PropertyList(), [this](const PropertyList& properties) -> ReturnValue { + return brightness_level_; + }); + + mcp_server.AddTool("self.led_strip.set_brightness", + "Set the brightness of the led strip (0-8)", + PropertyList({ + Property("level", kPropertyTypeInteger, 0, 8) + }), [this](const PropertyList& properties) -> ReturnValue { + int level = properties["level"].value(); + ESP_LOGI(TAG, "Set LedStrip brightness level to %d", level); + brightness_level_ = level; + led_strip_->SetBrightness(LevelToBrightness(brightness_level_), 4); + + // 保存设置 + Settings settings("led_strip", true); + settings.SetInt("brightness", brightness_level_); + + return true; + }); + + mcp_server.AddTool("self.led_strip.set_single_color", + "Set the color of a single led.", + PropertyList({ + Property("index", kPropertyTypeInteger, 0, 7), + Property("red", kPropertyTypeInteger, 0, 255), + Property("green", kPropertyTypeInteger, 0, 255), + Property("blue", kPropertyTypeInteger, 0, 255) + }), [this](const PropertyList& properties) -> ReturnValue { + int index = properties["index"].value(); + int red = properties["red"].value(); + int green = properties["green"].value(); + int blue = properties["blue"].value(); + ESP_LOGI(TAG, "Set led strip single color %d to %d, %d, %d", + index, red, green, blue); + led_strip_->SetSingleColor(index, RGBToColor(green, red, blue)); + return true; + }); + + mcp_server.AddTool("self.led_strip.set_all_color", + "Set the color of all leds.", + PropertyList({ + Property("red", kPropertyTypeInteger, 0, 255), + Property("green", kPropertyTypeInteger, 0, 255), + Property("blue", kPropertyTypeInteger, 0, 255) + }), [this](const PropertyList& properties) -> ReturnValue { + int red = properties["red"].value(); + int green = properties["green"].value(); + int blue = properties["blue"].value(); + ESP_LOGI(TAG, "Set led strip all color to %d, %d, %d", + red, green, blue); + led_strip_->SetAllColor(RGBToColor(green, red, blue)); + return true; + }); + + mcp_server.AddTool("self.led_strip.blink", + "Blink the led strip. (闪烁)", + PropertyList({ + Property("red", kPropertyTypeInteger, 0, 255), + Property("green", kPropertyTypeInteger, 0, 255), + Property("blue", kPropertyTypeInteger, 0, 255), + Property("interval", kPropertyTypeInteger, 0, 1000) + }), [this](const PropertyList& properties) -> ReturnValue { + int red = properties["red"].value(); + int green = properties["green"].value(); + int blue = properties["blue"].value(); + int interval = properties["interval"].value(); + ESP_LOGI(TAG, "Blink led strip with color %d, %d, %d, interval %dms", + red, green, blue, interval); + led_strip_->Blink(RGBToColor(green, red, blue), interval); + return true; + }); + + mcp_server.AddTool("self.led_strip.scroll", + "Scroll the led strip. (跑马灯)", + PropertyList({ + Property("red", kPropertyTypeInteger, 0, 255), + Property("green", kPropertyTypeInteger, 0, 255), + Property("blue", kPropertyTypeInteger, 0, 255), + Property("length", kPropertyTypeInteger, 1, 7), + Property("interval", kPropertyTypeInteger, 0, 1000) + }), [this](const PropertyList& properties) -> ReturnValue { + int red = properties["red"].value(); + int green = properties["green"].value(); + int blue = properties["blue"].value(); + int interval = properties["interval"].value(); + int length = properties["length"].value(); + ESP_LOGI(TAG, "Scroll led strip with color %d, %d, %d, length %d, interval %dms", + red, green, blue, length, interval); + StripColor low = RGBToColor(4, 4, 4); + StripColor high = RGBToColor(green, red, blue); + led_strip_->Scroll(low, high, length, interval); + return true; + }); + +} diff --git a/main/boards/waveshare/esp32-s3-lcd-0.85/led_strip_control.h b/main/boards/waveshare/esp32-s3-lcd-0.85/led_strip_control.h new file mode 100644 index 0000000..0e99bb3 --- /dev/null +++ b/main/boards/waveshare/esp32-s3-lcd-0.85/led_strip_control.h @@ -0,0 +1,18 @@ +#ifndef LED_STRIP_CONTROL_H +#define LED_STRIP_CONTROL_H + +#include "led/circular_strip.h" + +class LedStripControl { +private: + CircularStrip* led_strip_; + int brightness_level_; // 亮度等级 (0-8) + + int LevelToBrightness(int level) const; // 将等级转换为实际亮度值 + StripColor RGBToColor(int red, int green, int blue); + +public: + explicit LedStripControl(CircularStrip* led_strip); +}; + +#endif // LED_STRIP_CONTROL_H diff --git a/main/boards/waveshare/esp32-s3-lcd-0.85/power_manager.h b/main/boards/waveshare/esp32-s3-lcd-0.85/power_manager.h new file mode 100644 index 0000000..fd63cc0 --- /dev/null +++ b/main/boards/waveshare/esp32-s3-lcd-0.85/power_manager.h @@ -0,0 +1,212 @@ +#pragma once +#include +#include +#include + +#include +#include +#include "esp_adc/adc_oneshot.h" +#include "esp_adc/adc_cali.h" +#include "esp_adc/adc_cali_scheme.h" + +#include + +class PowerManager +{ +private: + gpio_num_t charging_pin_ = GPIO_NUM_NC; + gpio_num_t bat_adc_pin_ = GPIO_NUM_NC; + gpio_num_t bat_power_pin_ = GPIO_NUM_NC; + adc_oneshot_unit_handle_t adc_handle_ = NULL; + adc_cali_handle_t adc_cali_handle_ = NULL; + adc_channel_t adc_channel_; + bool do_calibration = false; + bool adc_calibration_init(adc_unit_t unit, adc_channel_t channel, adc_atten_t atten, adc_cali_handle_t *out_handle) + { + adc_cali_handle_t handle = NULL; + esp_err_t ret = ESP_FAIL; + bool calibrated = false; + + if (!calibrated) + { + ESP_LOGI("power_manager", "calibration scheme version is %s", "Curve Fitting"); + adc_cali_curve_fitting_config_t cali_config = { + .unit_id = unit, + .chan = channel, + .atten = atten, + .bitwidth = ADC_BITWIDTH_DEFAULT, + }; + ret = adc_cali_create_scheme_curve_fitting(&cali_config, &handle); + if (ret == ESP_OK) + { + calibrated = true; + } + } + + *out_handle = handle; + if (ret == ESP_OK) + { + ESP_LOGI("power_manager", "Calibration Success"); + } + else if (ret == ESP_ERR_NOT_SUPPORTED || !calibrated) + { + ESP_LOGW("power_manager", "eFuse not burnt, skip software calibration"); + } + else + { + ESP_LOGE("power_manager", "Invalid arg or no memory"); + } + return calibrated; + } + +public: + PowerManager(gpio_num_t charging_pin, gpio_num_t bat_adc_pin, gpio_num_t bat_power_pin) : charging_pin_(charging_pin), + bat_adc_pin_(bat_adc_pin), + bat_power_pin_(bat_power_pin) + { + // 初始化充电引脚 + if (charging_pin_ != GPIO_NUM_NC) + { + gpio_config_t io_conf = {}; + io_conf.intr_type = GPIO_INTR_DISABLE; + io_conf.mode = GPIO_MODE_INPUT; + io_conf.pin_bit_mask = 1ULL << charging_pin_; + io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE; + io_conf.pull_up_en = GPIO_PULLUP_ENABLE; + gpio_config(&io_conf); + } + // 初始化电池使能引脚 + if (bat_power_pin_ != GPIO_NUM_NC) + { + gpio_config_t io_conf = {}; + io_conf.intr_type = GPIO_INTR_DISABLE; + io_conf.mode = GPIO_MODE_OUTPUT; + io_conf.pin_bit_mask = 1ULL << bat_power_pin_; + io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE; + io_conf.pull_up_en = GPIO_PULLUP_DISABLE; + gpio_config(&io_conf); + } + + // 初始化adc + if (bat_adc_pin_ != GPIO_NUM_NC) + { + adc_oneshot_unit_init_cfg_t init_config = {}; + init_config.ulp_mode = ADC_ULP_MODE_DISABLE; + if (bat_adc_pin_ >= GPIO_NUM_1 && bat_adc_pin_ <= GPIO_NUM_10) + { + init_config.unit_id = ADC_UNIT_1; + adc_channel_ = (adc_channel_t)((int)bat_adc_pin_ - 1); + } + else if (bat_adc_pin_ >= GPIO_NUM_11 && bat_adc_pin_ <= GPIO_NUM_20) + { + init_config.unit_id = ADC_UNIT_2; + adc_channel_ = (adc_channel_t)((int)bat_adc_pin_ - 11); + } + else + { + return; + } + ESP_ERROR_CHECK(adc_oneshot_new_unit(&init_config, &adc_handle_)); + adc_oneshot_chan_cfg_t config = {}; + config.bitwidth = ADC_BITWIDTH_DEFAULT; + config.atten = ADC_ATTEN_DB_12; + ESP_ERROR_CHECK(adc_oneshot_config_channel(adc_handle_, adc_channel_, &config)); + do_calibration = adc_calibration_init(init_config.unit_id, adc_channel_, config.atten, &adc_cali_handle_); + } + } + + ~PowerManager() + { + if (adc_handle_) + { + ESP_ERROR_CHECK(adc_oneshot_del_unit(adc_handle_)); + } + // if (adc_cali_handle_) + // { + // ESP_ERROR_CHECK(adc_cali_delete_scheme_line_fitting(adc_cali_handle_)); + // } + } + + int GetBatteryLevel(void) + { + + int adc_raw = 0; + int voltage_int = 0; + const float voltage_float_threshold = 0.1f; + float voltage_float = 0.0f; + static float last_voltage_float = 0.0f; + + static int last_battery_level = 0; + + if (adc_handle_ != nullptr) + { + ESP_ERROR_CHECK(adc_oneshot_read(adc_handle_, adc_channel_, &adc_raw)); + if (do_calibration) + { + ESP_ERROR_CHECK(adc_cali_raw_to_voltage(adc_cali_handle_, adc_raw, &voltage_int)); + voltage_float = (voltage_int / 1000.0f) * 3.0; + + if (fabs(voltage_float - last_voltage_float) >= voltage_float_threshold) + { + last_voltage_float = voltage_float; + if (voltage_float < 3.52) { + last_battery_level = 1; + } else if (voltage_float < 3.64) { + last_battery_level = 20; + } else if (voltage_float < 3.76) { + last_battery_level = 40; + } else if (voltage_float < 3.88) { + last_battery_level = 60; + } else if (voltage_float < 4.0) { + last_battery_level = 80; + } else { + last_battery_level = 100; + } + } + return last_battery_level; + } + } + return 100; + } + + bool IsCharging(void) + { + if (charging_pin_ != GPIO_NUM_NC) + { + return gpio_get_level(charging_pin_) == 0 ? true : false; + } + return false; + } + + bool IsDischarging(void) + { + if (charging_pin_ != GPIO_NUM_NC) + { + return gpio_get_level(charging_pin_) == 1; + } + return true; + } + + bool IsChargingDone(void) + { + if (GetBatteryLevel() == 100) + { + return true; + } + return false; + } + void PowerOff(void) + { + if (bat_power_pin_ != GPIO_NUM_NC) + { + gpio_set_level(bat_power_pin_, 0); + } + } + void PowerON(void) + { + if (bat_power_pin_ != GPIO_NUM_NC) + { + gpio_set_level(bat_power_pin_, 1); + } + } +}; diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-1.54/README.md b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/README.md new file mode 100644 index 0000000..bb15826 --- /dev/null +++ b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/README.md @@ -0,0 +1,49 @@ +# 产品链接 + +[微雪电子 ESP32-S3-Touch-LCD-1.54](https://www.waveshare.net/shop/ESP32-S3-Touch-LCD-1.54.htm) +[微雪电子 ESP32-S3-LCD-1.54](https://www.waveshare.net/shop/ESP32-S3-LCD-1.54.htm) + +# 编译配置命令 + +**克隆工程** + +```bash +git clone https://github.com/78/xiaozhi-esp32.git +``` + +**进入工程** + +```bash +cd xiaozhi-esp32 +``` + +**配置编译目标为 ESP32S3** + +```bash +idf.py set-target esp32s3 +``` + +**打开 menuconfig** + +```bash +idf.py menuconfig +``` + +**选择板子** + +```bash +Xiaozhi Assistant -> Board Type -> Waveshare ESP32-S3-Touch-LCD-1.54 +``` + +**编译** + +```ba +idf.py build +``` + +**下载并打开串口终端** + +```bash +idf.py build flash monitor +``` + diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-1.54/config.h b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/config.h new file mode 100644 index 0000000..1625b26 --- /dev/null +++ b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/config.h @@ -0,0 +1,56 @@ +#ifndef _BOARD_CONFIG_H_ +#define _BOARD_CONFIG_H_ + +#include +#include + +#define AUDIO_INPUT_SAMPLE_RATE 24000 +#define AUDIO_OUTPUT_SAMPLE_RATE 24000 + +#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_8 +#define AUDIO_I2S_GPIO_WS GPIO_NUM_10 +#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_9 +#define AUDIO_I2S_GPIO_DIN GPIO_NUM_11 +#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_12 + +#define AUDIO_CODEC_PA_PIN GPIO_NUM_7 +#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_42 +#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_41 +#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR +#define AUDIO_CODEC_ES7210_ADDR ES7210_CODEC_DEFAULT_ADDR + +#define BUILTIN_LED_GPIO GPIO_NUM_NC +#define PWR_BUTTON_GPIO GPIO_NUM_5 +#define VOLUME_UP_BUTTON_GPIO GPIO_NUM_4 +#define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_0 + +#define DISPLAY_SPI_MODE 3 +#define DISPLAY_CS_PIN GPIO_NUM_21 +#define DISPLAY_MOSI_PIN GPIO_NUM_39 +#define DISPLAY_MISO_PIN GPIO_NUM_NC +#define DISPLAY_CLK_PIN GPIO_NUM_38 +#define DISPLAY_DC_PIN GPIO_NUM_45 +#define DISPLAY_RST_PIN GPIO_NUM_40 + +#define TOOUCH_INT_PIN GPIO_NUM_48 +#define TOOUCH_RST_PIN GPIO_NUM_47 + +#define BATTERY_EN_PIN GPIO_NUM_2 +#define BATTERY_ADC_PIN GPIO_NUM_1 +#define BATTERY_CHARGING_PIN GPIO_NUM_3 + +#define DISPLAY_WIDTH 240 +#define DISPLAY_HEIGHT 240 +#define DISPLAY_MIRROR_X false +#define DISPLAY_MIRROR_Y false +#define DISPLAY_SWAP_XY false +#define DISPLAY_RGB_ORDER LCD_RGB_ELEMENT_ORDER_RGB +#define DISPLAY_INVERT_COLOR true + +#define DISPLAY_OFFSET_X 0 +#define DISPLAY_OFFSET_Y 0 + +#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_46 +#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false + +#endif // _BOARD_CONFIG_H_ diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-1.54/config.json b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/config.json new file mode 100644 index 0000000..ec065ca --- /dev/null +++ b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/config.json @@ -0,0 +1,13 @@ +{ + "manufacturer": "waveshare", + "target": "esp32s3", + "builds": [ + { + "name": "esp32-s3-touch-lcd-1.54", + "sdkconfig_append": [ + "CONFIG_USE_WECHAT_MESSAGE_STYLE=n", + "CONFIG_USE_DEVICE_AEC=y" + ] + } + ] +} diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc new file mode 100644 index 0000000..10e384a --- /dev/null +++ b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/esp32-s3-touch-lcd-1.54.cc @@ -0,0 +1,342 @@ +#include "wifi_board.h" +#include "codecs/box_audio_codec.h" +#include "display/lcd_display.h" +#include "system_reset.h" +#include "application.h" +#include "button.h" +#include "config.h" +#include "mcp_server.h" + +#include +#include "i2c_device.h" +#include +#include +#include +#include +#include + +#include + +#include "power_save_timer.h" +#include "assets/lang_config.h" + +#include +#include +#include "driver/gpio.h" + +#include "iot_button.h" + +#include "power_manager.h" +#include "esp_ota_ops.h" + +#define TAG "waveshare_esp32_s3_touch_lcd_1_54" + +class CustomButton: public Button{ +public: + void OnPressDownDel(void) { + if (button_handle_ == nullptr) { + return; + } + on_press_down_ = NULL; + iot_button_unregister_cb(button_handle_, BUTTON_PRESS_DOWN, nullptr); + } + void OnPressUpDel(void) { + if (button_handle_ == nullptr) { + return; + } + on_press_up_ = NULL; + iot_button_unregister_cb(button_handle_, BUTTON_PRESS_UP, nullptr); + } +}; + + + +class CustomBoard : public WifiBoard { +private: + CustomButton pwr_button_; + CustomButton volume_up_button_; + CustomButton volume_down_button_; + i2c_master_bus_handle_t i2c_bus_; + LcdDisplay* display_; + PowerManager* power_manager_ = nullptr; + PowerSaveTimer* power_save_timer_ = nullptr; + + void InitializePowerManager() { + power_manager_ = new PowerManager(BATTERY_CHARGING_PIN, BATTERY_ADC_PIN, BATTERY_EN_PIN); + power_manager_->PowerON(); + } + + void InitializePowerSaveTimer() { + power_save_timer_ = new PowerSaveTimer(-1, 60, 300); + power_save_timer_->OnEnterSleepMode([this]() { + auto display = GetDisplay(); + display->SetChatMessage("system", ""); + display->SetEmotion("sleepy"); + GetBacklight()->SetBrightness(20); + }); + power_save_timer_->OnExitSleepMode([this]() { + auto display = GetDisplay(); + display->SetChatMessage("system", ""); + display->SetEmotion("neutral"); + GetBacklight()->RestoreBrightness(); + }); + power_save_timer_->OnShutdownRequest([this]() { + power_manager_->PowerOff(); + }); + power_save_timer_->SetEnabled(true); + } + + void InitializeI2c() { + // Initialize I2C peripheral + i2c_master_bus_config_t i2c_bus_cfg = { + .i2c_port = (i2c_port_t)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, &i2c_bus_)); + } + + void InitializeSpi() { + ESP_LOGI(TAG, "Initialize QSPI bus"); + spi_bus_config_t buscfg = {}; + buscfg.mosi_io_num = DISPLAY_MOSI_PIN; + buscfg.miso_io_num = DISPLAY_MISO_PIN; + buscfg.sclk_io_num = DISPLAY_CLK_PIN; + buscfg.quadwp_io_num = GPIO_NUM_NC; + buscfg.quadhd_io_num = GPIO_NUM_NC; + buscfg.max_transfer_sz = DISPLAY_WIDTH * DISPLAY_HEIGHT * sizeof(uint16_t); + ESP_ERROR_CHECK(spi_bus_initialize(SPI3_HOST, &buscfg, SPI_DMA_CH_AUTO)); + } + + void InitializeTouch() + { + esp_err_t ret = ESP_OK; + esp_lcd_touch_handle_t touch_handle; + + esp_lcd_panel_io_handle_t tp_io_handle = NULL; + + esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_CST816S_CONFIG(); + ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle)); + + esp_lcd_touch_config_t tp_cfg = { + .x_max = DISPLAY_WIDTH, + .y_max = DISPLAY_HEIGHT, + .rst_gpio_num = TOOUCH_RST_PIN, + .int_gpio_num = TOOUCH_INT_PIN, + .flags = { + .swap_xy = 0, + .mirror_x = 0, + .mirror_y = 0, + }, + }; + ESP_LOGI(TAG, "Initialize touch controller CST816"); + ret = esp_lcd_touch_new_i2c_cst816s(tp_io_handle, &tp_cfg, &touch_handle); + if (ret == ESP_OK) + { + const lvgl_port_touch_cfg_t touch_cfg = { + .disp = lv_display_get_default(), + .handle = touch_handle, + }; + lvgl_port_add_touch(&touch_cfg); + ESP_LOGI(TAG, "Touch panel initialized successfully"); + } + } + + void InitializeLcdDisplay() { + esp_lcd_panel_io_handle_t panel_io = nullptr; + esp_lcd_panel_handle_t panel = nullptr; + // 液晶屏控制IO初始化 + ESP_LOGI(TAG, "Install panel IO"); + esp_lcd_panel_io_spi_config_t io_config = {}; + io_config.cs_gpio_num = DISPLAY_CS_PIN; + io_config.dc_gpio_num = DISPLAY_DC_PIN; + io_config.spi_mode = DISPLAY_SPI_MODE; + io_config.pclk_hz = 40 * 1000 * 1000; + io_config.trans_queue_depth = 10; + io_config.lcd_cmd_bits = 8; + io_config.lcd_param_bits = 8; + ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi(SPI3_HOST, &io_config, &panel_io)); + + + // 初始化液晶屏驱动芯片 + ESP_LOGI(TAG, "Install LCD driver"); + esp_lcd_panel_dev_config_t panel_config = {}; + panel_config.reset_gpio_num = DISPLAY_RST_PIN; + panel_config.rgb_ele_order = DISPLAY_RGB_ORDER; + panel_config.bits_per_pixel = 16; + + ESP_ERROR_CHECK(esp_lcd_new_panel_st7789(panel_io, &panel_config, &panel)); + + + esp_lcd_panel_reset(panel); + + esp_lcd_panel_init(panel); + 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_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY + ); + } + + void InitializeButtons() { + + pwr_button_.OnPressUp([this]() { + pwr_button_.OnClick([this]() { + auto& app = Application::GetInstance(); + app.ToggleChatState(); + }); + pwr_button_.OnLongPress([this]() { + printf("Power button long press\n"); + // gpio_set_level(BATTERY_EN_PIN, 0); + if (power_manager_ != nullptr){ + power_manager_->PowerOff(); + } + }); + + pwr_button_.OnDoubleClick([this]() { + static uint8_t brightness_last = 0; + auto backlight = Board::GetInstance().GetBacklight(); + if (backlight->brightness() == 0) { + brightness_last = 0; + if (brightness_last == 0) { + backlight->SetBrightness(50, true); + } else { + backlight->SetBrightness(brightness_last, true); + } + } else { + brightness_last = backlight->brightness(); + backlight->SetBrightness(0); + } + }); + pwr_button_.OnMultipleClick([this]() { + EnterWifiConfigMode(); + }, 3); + pwr_button_.OnPressUpDel(); + }); + + volume_up_button_.OnClick([this]() { + auto codec = Board::GetInstance().GetAudioCodec(); + auto volume = codec->output_volume() + 10; + if (volume > 100) { + volume = 100; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume/10)); + }); + + volume_up_button_.OnLongPress([this]() { + Board::GetInstance().GetAudioCodec()->SetOutputVolume(100); + GetDisplay()->ShowNotification(Lang::Strings::MAX_VOLUME); + }); + + volume_down_button_.OnClick([this]() { + auto codec = Board::GetInstance().GetAudioCodec(); + auto volume = codec->output_volume() - 10; + if (volume < 0) { + volume = 0; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume/10)); + }); + + volume_down_button_.OnLongPress([this]() { + Board::GetInstance().GetAudioCodec()->SetOutputVolume(0); + GetDisplay()->ShowNotification(Lang::Strings::MUTED); + }); + +#if CONFIG_USE_DEVICE_AEC + volume_down_button_.OnDoubleClick([this]() { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateIdle) { + app.SetAecMode(app.GetAecMode() == kAecOff ? kAecOnDeviceSide : kAecOff); + } + }); +#endif + } + + // 初始化工具 + void InitializeTools() { + auto &mcp_server = McpServer::GetInstance(); + mcp_server.AddTool("self.system.reconfigure_wifi", + "Reboot the device 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: + CustomBoard() : + pwr_button_(PWR_BUTTON_GPIO), + volume_up_button_(VOLUME_UP_BUTTON_GPIO), + volume_down_button_(VOLUME_DOWN_BUTTON_GPIO) { + InitializePowerManager(); + InitializePowerSaveTimer(); + InitializeI2c(); + InitializeSpi(); + InitializeLcdDisplay(); + InitializeTouch(); + InitializeButtons(); + InitializeTools(); + GetBacklight()->RestoreBrightness(); + } + + virtual AudioCodec* GetAudioCodec() override { + static BoxAudioCodec audio_codec( + i2c_bus_, + 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, + AUDIO_CODEC_ES7210_ADDR, + true); + 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; + } + + virtual bool GetBatteryLevel(int &level, bool& charging, bool& discharging) override { + static bool last_discharging = false; + charging = power_manager_->IsCharging(); + discharging = power_manager_->IsDischarging(); + if (discharging != last_discharging) { + power_save_timer_->SetEnabled(discharging); + last_discharging = discharging; + } + + level = power_manager_->GetBatteryLevel(); + return true; + } + + virtual void SetPowerSaveLevel(PowerSaveLevel level) override { + if (level != PowerSaveLevel::LOW_POWER) { + power_save_timer_->WakeUp(); + } + WifiBoard::SetPowerSaveLevel(level); + } +}; + +DECLARE_BOARD(CustomBoard); diff --git a/main/boards/waveshare/esp32-s3-touch-lcd-1.54/power_manager.h b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/power_manager.h new file mode 100644 index 0000000..fd63cc0 --- /dev/null +++ b/main/boards/waveshare/esp32-s3-touch-lcd-1.54/power_manager.h @@ -0,0 +1,212 @@ +#pragma once +#include +#include +#include + +#include +#include +#include "esp_adc/adc_oneshot.h" +#include "esp_adc/adc_cali.h" +#include "esp_adc/adc_cali_scheme.h" + +#include + +class PowerManager +{ +private: + gpio_num_t charging_pin_ = GPIO_NUM_NC; + gpio_num_t bat_adc_pin_ = GPIO_NUM_NC; + gpio_num_t bat_power_pin_ = GPIO_NUM_NC; + adc_oneshot_unit_handle_t adc_handle_ = NULL; + adc_cali_handle_t adc_cali_handle_ = NULL; + adc_channel_t adc_channel_; + bool do_calibration = false; + bool adc_calibration_init(adc_unit_t unit, adc_channel_t channel, adc_atten_t atten, adc_cali_handle_t *out_handle) + { + adc_cali_handle_t handle = NULL; + esp_err_t ret = ESP_FAIL; + bool calibrated = false; + + if (!calibrated) + { + ESP_LOGI("power_manager", "calibration scheme version is %s", "Curve Fitting"); + adc_cali_curve_fitting_config_t cali_config = { + .unit_id = unit, + .chan = channel, + .atten = atten, + .bitwidth = ADC_BITWIDTH_DEFAULT, + }; + ret = adc_cali_create_scheme_curve_fitting(&cali_config, &handle); + if (ret == ESP_OK) + { + calibrated = true; + } + } + + *out_handle = handle; + if (ret == ESP_OK) + { + ESP_LOGI("power_manager", "Calibration Success"); + } + else if (ret == ESP_ERR_NOT_SUPPORTED || !calibrated) + { + ESP_LOGW("power_manager", "eFuse not burnt, skip software calibration"); + } + else + { + ESP_LOGE("power_manager", "Invalid arg or no memory"); + } + return calibrated; + } + +public: + PowerManager(gpio_num_t charging_pin, gpio_num_t bat_adc_pin, gpio_num_t bat_power_pin) : charging_pin_(charging_pin), + bat_adc_pin_(bat_adc_pin), + bat_power_pin_(bat_power_pin) + { + // 初始化充电引脚 + if (charging_pin_ != GPIO_NUM_NC) + { + gpio_config_t io_conf = {}; + io_conf.intr_type = GPIO_INTR_DISABLE; + io_conf.mode = GPIO_MODE_INPUT; + io_conf.pin_bit_mask = 1ULL << charging_pin_; + io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE; + io_conf.pull_up_en = GPIO_PULLUP_ENABLE; + gpio_config(&io_conf); + } + // 初始化电池使能引脚 + if (bat_power_pin_ != GPIO_NUM_NC) + { + gpio_config_t io_conf = {}; + io_conf.intr_type = GPIO_INTR_DISABLE; + io_conf.mode = GPIO_MODE_OUTPUT; + io_conf.pin_bit_mask = 1ULL << bat_power_pin_; + io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE; + io_conf.pull_up_en = GPIO_PULLUP_DISABLE; + gpio_config(&io_conf); + } + + // 初始化adc + if (bat_adc_pin_ != GPIO_NUM_NC) + { + adc_oneshot_unit_init_cfg_t init_config = {}; + init_config.ulp_mode = ADC_ULP_MODE_DISABLE; + if (bat_adc_pin_ >= GPIO_NUM_1 && bat_adc_pin_ <= GPIO_NUM_10) + { + init_config.unit_id = ADC_UNIT_1; + adc_channel_ = (adc_channel_t)((int)bat_adc_pin_ - 1); + } + else if (bat_adc_pin_ >= GPIO_NUM_11 && bat_adc_pin_ <= GPIO_NUM_20) + { + init_config.unit_id = ADC_UNIT_2; + adc_channel_ = (adc_channel_t)((int)bat_adc_pin_ - 11); + } + else + { + return; + } + ESP_ERROR_CHECK(adc_oneshot_new_unit(&init_config, &adc_handle_)); + adc_oneshot_chan_cfg_t config = {}; + config.bitwidth = ADC_BITWIDTH_DEFAULT; + config.atten = ADC_ATTEN_DB_12; + ESP_ERROR_CHECK(adc_oneshot_config_channel(adc_handle_, adc_channel_, &config)); + do_calibration = adc_calibration_init(init_config.unit_id, adc_channel_, config.atten, &adc_cali_handle_); + } + } + + ~PowerManager() + { + if (adc_handle_) + { + ESP_ERROR_CHECK(adc_oneshot_del_unit(adc_handle_)); + } + // if (adc_cali_handle_) + // { + // ESP_ERROR_CHECK(adc_cali_delete_scheme_line_fitting(adc_cali_handle_)); + // } + } + + int GetBatteryLevel(void) + { + + int adc_raw = 0; + int voltage_int = 0; + const float voltage_float_threshold = 0.1f; + float voltage_float = 0.0f; + static float last_voltage_float = 0.0f; + + static int last_battery_level = 0; + + if (adc_handle_ != nullptr) + { + ESP_ERROR_CHECK(adc_oneshot_read(adc_handle_, adc_channel_, &adc_raw)); + if (do_calibration) + { + ESP_ERROR_CHECK(adc_cali_raw_to_voltage(adc_cali_handle_, adc_raw, &voltage_int)); + voltage_float = (voltage_int / 1000.0f) * 3.0; + + if (fabs(voltage_float - last_voltage_float) >= voltage_float_threshold) + { + last_voltage_float = voltage_float; + if (voltage_float < 3.52) { + last_battery_level = 1; + } else if (voltage_float < 3.64) { + last_battery_level = 20; + } else if (voltage_float < 3.76) { + last_battery_level = 40; + } else if (voltage_float < 3.88) { + last_battery_level = 60; + } else if (voltage_float < 4.0) { + last_battery_level = 80; + } else { + last_battery_level = 100; + } + } + return last_battery_level; + } + } + return 100; + } + + bool IsCharging(void) + { + if (charging_pin_ != GPIO_NUM_NC) + { + return gpio_get_level(charging_pin_) == 0 ? true : false; + } + return false; + } + + bool IsDischarging(void) + { + if (charging_pin_ != GPIO_NUM_NC) + { + return gpio_get_level(charging_pin_) == 1; + } + return true; + } + + bool IsChargingDone(void) + { + if (GetBatteryLevel() == 100) + { + return true; + } + return false; + } + void PowerOff(void) + { + if (bat_power_pin_ != GPIO_NUM_NC) + { + gpio_set_level(bat_power_pin_, 0); + } + } + void PowerON(void) + { + if (bat_power_pin_ != GPIO_NUM_NC) + { + gpio_set_level(bat_power_pin_, 1); + } + } +};