diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 00aa5c4a4..5a7b224a6 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -526,6 +526,11 @@ elseif(CONFIG_BOARD_TYPE_WIRELESS_TAG_WTP4C5MP07S) set(BUILTIN_TEXT_FONT font_puhui_basic_30_4) set(BUILTIN_ICON_FONT font_awesome_30_4) set(DEFAULT_EMOJI_COLLECTION twemoji_64) +elseif(CONFIG_BOARD_TYPE_LC_S3_WIFI_1_54TFT) + set(BOARD_TYPE "lc-s3-wifi-1.54tft") + 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_AIPI_LITE) set(BOARD_TYPE "aipi-lite") set(BUILTIN_TEXT_FONT font_puhui_basic_14_1) diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 195627364..dfedffbb3 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -135,6 +135,9 @@ choice BOARD_TYPE config BOARD_TYPE_BREAD_COMPACT_ESP32_LCD bool "Bread Compact ESP32 DevKit + LCD (面包板)" depends on IDF_TARGET_ESP32 + config BOARD_TYPE_LC_S3_WIFI_1_54TFT + bool "LC-S3-WIFI-1.54TFT开发板" + depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_XMINI_C3_V3 bool "Xmini C3 V3" depends on IDF_TARGET_ESP32C3 diff --git a/main/boards/lc-s3-wifi-1.54tft/README.md b/main/boards/lc-s3-wifi-1.54tft/README.md new file mode 100644 index 000000000..d8318af2d --- /dev/null +++ b/main/boards/lc-s3-wifi-1.54tft/README.md @@ -0,0 +1,45 @@ +# 产品相关介绍网址 + +```http +https://e.tb.cn/h.SGsVUyX3kgbheiq?tk=YW7Of9Ahlkf CZ028 +``` + +# 编译配置命令 + +**配置编译目标为 ESP32S3：** + +```bash +idf.py set-target esp32s3 +``` + +**打开 menuconfig：** + +```bash +idf.py menuconfig +``` + +**选择板子：** + +``` +Xiaozhi Assistant -> Board Type -> lc-s3-wifi-1.54tft +``` + +``` + +**编译：** + +bash +idf.py build +``` + +**下载：** +idf.py build flash monitor + +进行下载和显示日志 + + +**固件生成：** + +```bash +idf.py merge-bin +``` diff --git a/main/boards/lc-s3-wifi-1.54tft/config.h b/main/boards/lc-s3-wifi-1.54tft/config.h new file mode 100644 index 000000000..4a82a87c1 --- /dev/null +++ b/main/boards/lc-s3-wifi-1.54tft/config.h @@ -0,0 +1,50 @@ +#ifndef _BOARD_CONFIG_H_ +#define _BOARD_CONFIG_H_ + +#include +#include + +// 音频配置 +#define AUDIO_INPUT_SAMPLE_RATE 16000 +#define AUDIO_OUTPUT_SAMPLE_RATE 16000 + +#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_5 +#define AUDIO_I2S_GPIO_WS GPIO_NUM_2 +#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_4 +#define AUDIO_I2S_GPIO_DIN GPIO_NUM_3 +#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_1 + +#define AUDIO_CODEC_PA_PIN GPIO_NUM_8 +#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_7 +#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_6 +#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR + +// 按钮配置 +#define BUILTIN_LED_GPIO GPIO_NUM_46 +#define BOOT_BUTTON_GPIO GPIO_NUM_0 +#define VOLUME_UP_BUTTON_GPIO GPIO_NUM_40 +#define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_39 + +// 显示屏配置 +#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_OFFSET_X 0 +#define DISPLAY_OFFSET_Y 0 + +#define DISPLAY_DC_GPIO GPIO_NUM_10 +#define DISPLAY_CS_GPIO GPIO_NUM_13 +#define DISPLAY_CLK_GPIO GPIO_NUM_14 +#define DISPLAY_MOSI_GPIO GPIO_NUM_15 +#define DISPLAY_RST_GPIO GPIO_NUM_16 + +#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_21 +#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false + +//扩展 +#define RELAY_LED GPIO_NUM_17 + +#endif // _BOARD_CONFIG_H_ diff --git a/main/boards/lc-s3-wifi-1.54tft/config.json b/main/boards/lc-s3-wifi-1.54tft/config.json new file mode 100644 index 000000000..54afbafd1 --- /dev/null +++ b/main/boards/lc-s3-wifi-1.54tft/config.json @@ -0,0 +1,9 @@ +{ + "target": "esp32s3", + "builds": [ + { + "name": "lc-s3-wifi-1.54tft", + "sdkconfig_append": [] + } + ] +} \ No newline at end of file diff --git a/main/boards/lc-s3-wifi-1.54tft/lc-s3-wifi-1.54tft.cc b/main/boards/lc-s3-wifi-1.54tft/lc-s3-wifi-1.54tft.cc new file mode 100644 index 000000000..7b82ed9b9 --- /dev/null +++ b/main/boards/lc-s3-wifi-1.54tft/lc-s3-wifi-1.54tft.cc @@ -0,0 +1,251 @@ +#include "wifi_board.h" +#include "codecs/es8311_audio_codec.h" +#include "display/lcd_display.h" +#include "system_reset.h" +#include "application.h" +#include "button.h" +#include "config.h" +#include "assets/lang_config.h" +#include "led/single_led.h" +#include "mcp_server.h" +#include "power_manager.h" + +#include +#include +#include +#include +#include + +#define TAG "lc-s3-wifi-1.54tft" + +LV_FONT_DECLARE(font_puhui_20_4); +LV_FONT_DECLARE(font_awesome_20_4); + +class lc_s3_wifi_1_54tft : public WifiBoard { +private: + i2c_master_bus_handle_t i2c_bus_; + Button volume_up_button_; + Button volume_down_button_; + Button boot_button_; + PowerManager* power_manager_; + Display* display_; + bool led_on_ = false; + //电源管理初始化 + void InitializePowerManager() { + power_manager_ = new PowerManager(GPIO_NUM_38); + power_manager_->OnChargingStatusChanged([this](bool is_charging) { + if (is_charging) { + //power_save_timer_->SetEnabled(false); + } else { + //power_save_timer_->SetEnabled(true); + } + }); + } + + //i2c初始化，音频ES8311 + void InitializeI2c() { + // 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, &i2c_bus_)); + } + + //SPI初始化，显示屏 + void InitializeSpi() { + spi_bus_config_t buscfg = {}; + buscfg.mosi_io_num = DISPLAY_MOSI_GPIO; + buscfg.miso_io_num = GPIO_NUM_NC; + buscfg.sclk_io_num = DISPLAY_CLK_GPIO; + 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 InitializeButtons() { + boot_button_.OnClick([this]() { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) { + ResetWifiConfiguration(); + } + app.ToggleChatState(); + }); + volume_up_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() + 10; + if (volume > 100) { + volume = 100; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume)); + }); + + volume_up_button_.OnLongPress([this]() { + GetAudioCodec()->SetOutputVolume(100); + GetDisplay()->ShowNotification(Lang::Strings::MAX_VOLUME); + }); + + volume_down_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() - 10; + if (volume < 0) { + volume = 0; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume)); + }); + + volume_down_button_.OnLongPress([this]() { + GetAudioCodec()->SetOutputVolume(0); + GetDisplay()->ShowNotification(Lang::Strings::MUTED); + }); + } + + //显示屏初始化 + void InitializeDisplay() { + esp_lcd_panel_io_handle_t panel_io = nullptr; + esp_lcd_panel_handle_t panel = nullptr; + + // 液晶屏控制IO初始化 + ESP_LOGD(TAG, "Install panel IO"); + esp_lcd_panel_io_spi_config_t io_config = {}; + io_config.cs_gpio_num = DISPLAY_CS_GPIO; + io_config.dc_gpio_num = DISPLAY_DC_GPIO; + io_config.spi_mode = 0; + 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_LOGD(TAG, "Install LCD driver"); + + esp_lcd_panel_dev_config_t panel_config = {}; + panel_config.reset_gpio_num = DISPLAY_RST_GPIO; + panel_config.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB; + 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, true); + esp_lcd_panel_disp_on_off(panel, true); + + display_ = new SpiLcdDisplay( + panel_io, + panel, + DISPLAY_WIDTH, + DISPLAY_HEIGHT, + DISPLAY_OFFSET_X, + DISPLAY_OFFSET_Y, + DISPLAY_SWAP_XY, + DISPLAY_MIRROR_X, + DISPLAY_MIRROR_Y + ); + } + + void InitializeGpio() { + gpio_config_t io_conf = { + .pin_bit_mask = 1 << RELAY_LED, // 配置 GPIO + .mode = GPIO_MODE_OUTPUT, // 设置为输出模式 + .pull_up_en = GPIO_PULLUP_DISABLE, // 禁用上拉电阻 + .pull_down_en = GPIO_PULLDOWN_DISABLE, // 禁用下拉电阻 + .intr_type = GPIO_INTR_DISABLE, // 禁用中断 + }; + gpio_config(&io_conf); // 应用配置 + gpio_set_level(RELAY_LED,0); + } + + // 物联网初始化，添加对 AI 可见设备 + void InitializeTools() { + auto& mcp_server = McpServer::GetInstance(); + // 灯光控制 + mcp_server.AddTool("self.light.get_power", "获取灯是否打开", PropertyList(), [this](const PropertyList& properties) -> ReturnValue { + return led_on_; + }); + + mcp_server.AddTool("self.light.turn_on", "打开灯", PropertyList(), [this](const PropertyList& properties) -> ReturnValue { + gpio_set_level(RELAY_LED, 1); + led_on_ = true; + return true; + }); + + mcp_server.AddTool("self.light.turn_off", "关闭灯", PropertyList(), [this](const PropertyList& properties) -> ReturnValue { + gpio_set_level(RELAY_LED, 0); + led_on_ = false; + return true; + }); + } + +public: + //构造函数 + lc_s3_wifi_1_54tft() : + volume_up_button_(VOLUME_UP_BUTTON_GPIO), + volume_down_button_(VOLUME_DOWN_BUTTON_GPIO), + boot_button_(BOOT_BUTTON_GPIO) { + InitializePowerManager(); + InitializeI2c(); + InitializeSpi(); + InitializeDisplay(); + InitializeButtons(); + InitializeGpio(); + InitializeTools(); + GetBacklight()->SetBrightness(70); + } + + //获取音频编码器 + virtual AudioCodec* GetAudioCodec() override { + static Es8311AudioCodec audio_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; + } + + 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 Led* GetLed() override { + static SingleLed led(BUILTIN_LED_GPIO); + return &led; + } +}; + +DECLARE_BOARD(lc_s3_wifi_1_54tft); diff --git a/main/boards/lc-s3-wifi-1.54tft/power_manager.h b/main/boards/lc-s3-wifi-1.54tft/power_manager.h new file mode 100644 index 000000000..37726ccc8 --- /dev/null +++ b/main/boards/lc-s3-wifi-1.54tft/power_manager.h @@ -0,0 +1,209 @@ +#pragma once +#include +#include + +#include +#include +#include +/* +1.充电状态监测：通过GPIO引脚检测设备是否正在充电 +2.电池电量监测：通过ADC读取电池电压并转换为电量百分比 +3.低电量警告：当电量低于阈值(20%)时触发回调 +4.状态变化通知：提供充电状态和低电量状态变化的回调函数 +*/ +class PowerManager { +private: + esp_timer_handle_t timer_handle_;//ESP定时器句柄，用于定期检查电池状态 + std::function on_charging_status_changed_;//充电状态变化回调函数 + std::function on_low_battery_status_changed_;//低电量状态变化回调函数 + + gpio_num_t charging_pin_ = GPIO_NUM_NC;//用于检测充电状态的GPIO引脚 + std::vector adc_values_;//存储最近几次ADC读数的向量 + uint32_t battery_level_ = 0;//当前电池电量百分比(0-100) + bool is_charging_ = false;//当前是否正在充电 + bool is_low_battery_ = false;//当前是否处于低电量状态 + int ticks_ = 0;//定时器计数，用于控制ADC读取频率 + const int kBatteryAdcInterval = 60;//ADC读取间隔(60秒) + const int kBatteryAdcDataCount = 3;//用于计算平均值的ADC采样数(3次) + const int kLowBatteryLevel = 20;//低电量阈值(20%) + + adc_oneshot_unit_handle_t adc_handle_;//ADC单次采样单元句柄 + + /* + 检查充电状态变化 + 管理ADC数据采集频率 + 在充电状态变化时立即读取ADC数据 + */ + void CheckBatteryStatus() { + + 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 (adc_values_.size() < kBatteryAdcDataCount) { + ReadBatteryAdcData(); + return; + } + + // 如果电池电量数据充足，则每 kBatteryAdcInterval 个 tick 读取一次电池电量数据 + ticks_++; + if (ticks_ % kBatteryAdcInterval == 0) { + ReadBatteryAdcData(); + } + } + + /* + 从ADC通道读取电池电压 + 维护最近3次读数用于平均计算 + 使用线性插值将ADC值转换为电量百分比 + 检查低电量状态变化 + */ + void ReadBatteryAdcData() { + int adc_value; + ESP_ERROR_CHECK(adc_oneshot_read(adc_handle_, ADC_CHANNEL_8, &adc_value)); + + // 将 ADC 值添加到队列中 + adc_values_.push_back(adc_value); + if (adc_values_.size() > kBatteryAdcDataCount) { + adc_values_.erase(adc_values_.begin()); + } + uint32_t average_adc = 0; + for (auto value : adc_values_) { + average_adc += value; + } + average_adc /= adc_values_.size(); + + // 定义电池电量区间 + const struct { + uint16_t adc; + uint8_t level; + } levels[] = { + {1970, 0}, + {2062, 20}, + {2154, 40}, + {2246, 60}, + {2338, 80}, + {2430, 100} + }; + + // 低于最低值时 + if (average_adc < levels[0].adc) { + battery_level_ = 0; + } + // 高于最高值时 + else if (average_adc >= levels[5].adc) { + battery_level_ = 100; + } else { + // 线性插值计算中间值 + 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 pin) : charging_pin_(pin) { + //初始化充电检测GPIO引脚 + //创建并启动定时器(每秒触发一次) + //初始化ADC单元(使用ADC1，通道8) + 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_DISABLE; + gpio_config(&io_conf); + + // 创建电池电量检查定时器 + esp_timer_create_args_t timer_args = { + .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_, 1000000)); + + // 初始化 ADC + adc_oneshot_unit_init_cfg_t init_config = { + .unit_id = ADC_UNIT_1, + .ulp_mode = ADC_ULP_MODE_DISABLE, + }; + ESP_ERROR_CHECK(adc_oneshot_new_unit(&init_config, &adc_handle_)); + + adc_oneshot_chan_cfg_t chan_config = { + .atten = ADC_ATTEN_DB_12, + .bitwidth = ADC_BITWIDTH_12, + }; + ESP_ERROR_CHECK(adc_oneshot_config_channel(adc_handle_, ADC_CHANNEL_8, &chan_config)); + } + + ~PowerManager() { + //停止并删除定时器 + //删除ADC单元 + if (timer_handle_) { + esp_timer_stop(timer_handle_); + esp_timer_delete(timer_handle_); + } + if (adc_handle_) { + adc_oneshot_del_unit(adc_handle_); + } + } + + //返回是否正在充电(电量满时返回false) + bool IsCharging() { + // 如果电量已经满了，则不再显示充电中 + if (battery_level_ == 100) { + return false; + } + return is_charging_; + } + + //返回是否在放电 + 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; + } +};