From 02abd715884472ac6ed2b91f023f1f3c32379582 Mon Sep 17 00:00:00 2001 From: wdmomoxx <540825306@qq.com> Date: Tue, 3 Jun 2025 12:20:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0ESP32=20CGC=20MCP=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AAESP32=20CGC=20144=E7=9A=84=E5=BC=80=E5=8F=91=E6=9D=BF?= =?UTF-8?q?=20(#736)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update README.md * Update config.h 增加MCP控制方式 * Update esp32_cgc_board.cc 增加MCP控制方式 * Update CMakeLists.txt 增加ESP32 CGC 144开发板 * Update Kconfig.projbuild 增加ESP32 CGC 144开发板 * Create README.md 增加ESP32 CGC 144开发板 * Add files via upload * Update config.h 修改注释 --- main/CMakeLists.txt | 2 + main/Kconfig.projbuild | 3 + main/boards/esp32-cgc-144/README.md | 42 ++++ main/boards/esp32-cgc-144/board_control.cc | 60 +++++ main/boards/esp32-cgc-144/config.h | 73 ++++++ main/boards/esp32-cgc-144/config.json | 10 + .../esp32-cgc-144/esp32_cgc_144_board.cc | 220 ++++++++++++++++++ main/boards/esp32-cgc-144/power_manager.h | 186 +++++++++++++++ .../boards/esp32-cgc-144/power_manager_lite.h | 185 +++++++++++++++ main/boards/esp32-cgc/README.md | 4 +- main/boards/esp32-cgc/config.h | 3 + main/boards/esp32-cgc/esp32_cgc_board.cc | 7 + 12 files changed, 794 insertions(+), 1 deletion(-) create mode 100644 main/boards/esp32-cgc-144/README.md create mode 100644 main/boards/esp32-cgc-144/board_control.cc create mode 100644 main/boards/esp32-cgc-144/config.h create mode 100644 main/boards/esp32-cgc-144/config.json create mode 100644 main/boards/esp32-cgc-144/esp32_cgc_144_board.cc create mode 100644 main/boards/esp32-cgc-144/power_manager.h create mode 100644 main/boards/esp32-cgc-144/power_manager_lite.h diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 414b63b7..1b6c65d8 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -172,6 +172,8 @@ elseif(CONFIG_BOARD_TYPE_GENJUTECH_S3_1_54TFT) set(BOARD_TYPE "genjutech-s3-1.54tft") elseif(CONFIG_BOARD_TYPE_ESP32_CGC) set(BOARD_TYPE "esp32-cgc") +elseif(CONFIG_BOARD_TYPE_ESP32_CGC_144) + set(BOARD_TYPE "esp32-cgc-144") elseif(CONFIG_BOARD_TYPE_ESP_S3_LCD_EV_Board) set(BOARD_TYPE "esp-s3-lcd-ev-board") elseif(CONFIG_BOARD_TYPE_ZHENGCHEN_1_54TFT_WIFI) diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index bca60cca..1f759b73 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -85,6 +85,9 @@ choice BOARD_TYPE config BOARD_TYPE_ESP32_CGC bool "ESP32 CGC" depends on IDF_TARGET_ESP32 + config BOARD_TYPE_ESP32_CGC_144 + bool "ESP32 CGC 144" + depends on IDF_TARGET_ESP32 config BOARD_TYPE_KEVIN_YUYING_313LCD bool "鱼鹰科技3.13LCD开发板" depends on IDF_TARGET_ESP32S3 diff --git a/main/boards/esp32-cgc-144/README.md b/main/boards/esp32-cgc-144/README.md new file mode 100644 index 00000000..60fe5932 --- /dev/null +++ b/main/boards/esp32-cgc-144/README.md @@ -0,0 +1,42 @@ +# 相关资料： +- [插线款](https://www.wdmomo.fun:81/doc/index.html?file=001_%E8%AE%BE%E8%AE%A1%E9%A1%B9%E7%9B%AE/0001_%E5%B0%8F%E6%99%BAAI/003_ESP32-CGC-144%E6%8F%92%E7%BA%BF%E7%89%88%E5%B0%8F%E6%99%BAAI) + +- [电池款](https://www.wdmomo.fun:81/doc/index.html?file=001_%E8%AE%BE%E8%AE%A1%E9%A1%B9%E7%9B%AE/0001_%E5%B0%8F%E6%99%BAAI/004_ESP32-CGC-144%E7%94%B5%E6%B1%A0%E7%89%88%E5%B0%8F%E6%99%BAAI) + +# 编译配置命令 + +**配置编译目标为 ESP32：** + +```bash +idf.py set-target esp32 +``` + +**打开 menuconfig：** + +```bash +idf.py menuconfig +``` + +**选择板子：** + +``` +Xiaozhi Assistant -> Board Type -> ESP32 CGC 144 +``` + +**修改 flash 大小：** + +``` +Serial flasher config -> Flash size -> 4 MB +``` + +**修改分区表：** + +``` +Partition Table -> Custom partition CSV file -> partitions_4M.csv +``` + +**编译：** + +```bash +idf.py build +``` diff --git a/main/boards/esp32-cgc-144/board_control.cc b/main/boards/esp32-cgc-144/board_control.cc new file mode 100644 index 00000000..66f22d79 --- /dev/null +++ b/main/boards/esp32-cgc-144/board_control.cc @@ -0,0 +1,60 @@ +#include +#include +#include +#include + +#include "board.h" +#include "boards/common/wifi_board.h" +#include "boards/esp32-cgc-144/config.h" +#include "iot/thing.h" + +#include "audio_codec.h" + +#define TAG "BoardControl" + +namespace iot { + +class BoardControl : public Thing { +public: + BoardControl() : Thing("BoardControl", "当前 AI 机器人管理和控制") { + // 修改音量调节 + properties_.AddNumberProperty("volume", "当前音量值", [this]() -> int { + auto codec = Board::GetInstance().GetAudioCodec(); + return codec->output_volume(); + }); + + // 定义设备可以被远程执行的指令 + #if defined(ESP32_CGC_144_lite) + methods_.AddMethod("SetVolume", "设置音量", ParameterList({ + Parameter("volume", "0到100之间的整数", kValueTypeNumber, true) + }), [this](const ParameterList& parameters) { + auto codec = Board::GetInstance().GetAudioCodec(); + // 获取传入的音量值 + int volume = parameters["volume"].number(); + // 限制音量值 + if (volume > 66) { + volume = 66; + } + codec->SetOutputVolume(static_cast(volume)); + }); + #else + methods_.AddMethod("SetVolume", "设置音量", ParameterList({ + Parameter("volume", "0到100之间的整数", kValueTypeNumber, true) + }), [this](const ParameterList& parameters) { + auto codec = Board::GetInstance().GetAudioCodec(); + // 获取传入的音量值 + int volume = parameters["volume"].number(); + // 限制音量值 + if (volume > 100) { + volume = 100; + } + codec->SetOutputVolume(static_cast(volume)); + }); + #endif + + } +}; + +} // namespace iot + +DECLARE_THING(BoardControl); diff --git a/main/boards/esp32-cgc-144/config.h b/main/boards/esp32-cgc-144/config.h new file mode 100644 index 00000000..6a23386b --- /dev/null +++ b/main/boards/esp32-cgc-144/config.h @@ -0,0 +1,73 @@ +#ifndef _BOARD_CONFIG_H_ +#define _BOARD_CONFIG_H_ + +#include + +// 如果使用插线版本接入电池，请启用下面一行 +//#define ESP32_CGC_144_lite + +#define AUDIO_INPUT_SAMPLE_RATE 16000 +#define AUDIO_OUTPUT_SAMPLE_RATE 24000 + +#define AUDIO_I2S_MIC_GPIO_WS GPIO_NUM_25 +#define AUDIO_I2S_MIC_GPIO_SCK GPIO_NUM_26 +#define AUDIO_I2S_MIC_GPIO_DIN GPIO_NUM_32 + +#define AUDIO_I2S_SPK_GPIO_DOUT GPIO_NUM_33 +#define AUDIO_I2S_SPK_GPIO_BCLK GPIO_NUM_14 +#define AUDIO_I2S_SPK_GPIO_LRCK GPIO_NUM_27 + +#define BOOT_BUTTON_GPIO GPIO_NUM_0 +#define ASR_BUTTON_GPIO GPIO_NUM_13 + +// A MCP Test: Control a lamp +#define LAMP_GPIO GPIO_NUM_12 + +#define DISPLAY_SDA_PIN GPIO_NUM_NC +#define DISPLAY_SCL_PIN GPIO_NUM_NC + +#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_4 +#define DISPLAY_SCLK_PIN GPIO_NUM_18 +#define DISPLAY_MOSI_PIN GPIO_NUM_23 +#define DISPLAY_CS_PIN GPIO_NUM_5 +#define DISPLAY_DC_PIN GPIO_NUM_2 +#define DISPLAY_RESET_PIN GPIO_NUM_NC + +#define DISPLAY_SPI_SCLK_HZ (20 * 1000 * 1000) + +// 如果使用240x240的屏幕，请注释下面一行 +#define LCD_128X128 + +#ifdef LCD_128X128 +#define LCD_TYPE_ST7789_SERIAL +#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_INVERT_COLOR false +#define DISPLAY_RGB_ORDER LCD_RGB_ELEMENT_ORDER_BGR +#define DISPLAY_OFFSET_X 2 +#define DISPLAY_OFFSET_Y 3 +#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true +#define DISPLAY_SPI_MODE 0 + +#else + +#define LCD_TYPE_ST7789_SERIAL +#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_INVERT_COLOR true +#define DISPLAY_RGB_ORDER LCD_RGB_ELEMENT_ORDER_RGB +#define DISPLAY_OFFSET_X 0 +#define DISPLAY_OFFSET_Y 0 +#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true +#define DISPLAY_SPI_MODE 0 + +#endif + + +#endif // _BOARD_CONFIG_H_ diff --git a/main/boards/esp32-cgc-144/config.json b/main/boards/esp32-cgc-144/config.json new file mode 100644 index 00000000..713d86fb --- /dev/null +++ b/main/boards/esp32-cgc-144/config.json @@ -0,0 +1,10 @@ +{ + "target": "esp32", + "builds": [ + { + "name": "esp32-cgc-144", + "sdkconfig_append": [ + "CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y", + "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions_4M.csv\"" + ] + } diff --git a/main/boards/esp32-cgc-144/esp32_cgc_144_board.cc b/main/boards/esp32-cgc-144/esp32_cgc_144_board.cc new file mode 100644 index 00000000..8d3f7bd6 --- /dev/null +++ b/main/boards/esp32-cgc-144/esp32_cgc_144_board.cc @@ -0,0 +1,220 @@ +#include "wifi_board.h" +#include "audio_codecs/no_audio_codec.h" +#include "display/lcd_display.h" +#include "system_reset.h" +#include "application.h" +#include "button.h" +#include "config.h" +#include "power_save_timer.h" +#include "mcp_server.h" +#include "lamp_controller.h" +#include "iot/thing_manager.h" +#include "led/single_led.h" +#include "assets/lang_config.h" + +#include +#include +#include +#include +#include +#include + +#include + +#if defined(ESP32_CGC_144_lite) +#include "power_manager_lite.h" +#else +#include "power_manager.h" +#endif + + +#define TAG "ESP32_CGC_144" + +LV_FONT_DECLARE(font_puhui_14_1); +LV_FONT_DECLARE(font_awesome_14_1); + +class ESP32_CGC_144 : public WifiBoard { +private: + Button boot_button_; + LcdDisplay* display_; + Button asr_button_; + PowerSaveTimer* power_save_timer_; + PowerManager* power_manager_; + esp_lcd_panel_io_handle_t panel_io = nullptr; + esp_lcd_panel_handle_t panel = nullptr; + +#if defined(ESP32_CGC_144_lite) +void InitializePowerManager() { + power_manager_ = new PowerManager(GPIO_NUM_NC); + power_manager_->OnChargingStatusChanged([this](bool is_charging) { + if (is_charging) { + power_save_timer_->SetEnabled(false); + } else { + power_save_timer_->SetEnabled(true); + } + }); +} +#else +void InitializePowerManager() { + power_manager_ = new PowerManager(GPIO_NUM_36); + power_manager_->OnChargingStatusChanged([this](bool is_charging) { + if (is_charging) { + power_save_timer_->SetEnabled(false); + } else { + power_save_timer_->SetEnabled(true); + } + }); +} +#endif + + void InitializePowerSaveTimer() { + power_save_timer_ = new PowerSaveTimer(-1, 60); + 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_->SetEnabled(true); + } + + + void InitializeSpi() { + spi_bus_config_t buscfg = {}; + buscfg.mosi_io_num = DISPLAY_MOSI_PIN; + buscfg.miso_io_num = GPIO_NUM_NC; + buscfg.sclk_io_num = DISPLAY_SCLK_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 InitializeSt7735Display() { + // 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_PIN; + io_config.dc_gpio_num = DISPLAY_DC_PIN; + io_config.spi_mode = DISPLAY_SPI_MODE; + io_config.pclk_hz = DISPLAY_SPI_SCLK_HZ; + 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_RESET_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, + { + .text_font = &font_puhui_14_1, + .icon_font = &font_awesome_14_1, + .emoji_font = font_emoji_32_init(), + }); + } + + + + + void InitializeButtons() { + + boot_button_.OnClick([this]() { + power_save_timer_->WakeUp(); + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) { + ResetWifiConfiguration(); + } + app.ToggleChatState(); + }); + + asr_button_.OnClick([this]() { + power_save_timer_->WakeUp(); + std::string wake_word="你好小智"; + Application::GetInstance().WakeWordInvoke(wake_word); + }); + + } + + // 物联网初始化，添加对 AI 可见设备 + void InitializeIot() { +#if CONFIG_IOT_PROTOCOL_XIAOZHI + auto& thing_manager = iot::ThingManager::GetInstance(); + thing_manager.AddThing(iot::CreateThing("Screen")); + thing_manager.AddThing(iot::CreateThing("BoardControl")); + thing_manager.AddThing(iot::CreateThing("Battery")); + thing_manager.AddThing(iot::CreateThing("Lamp")); +#elif CONFIG_IOT_PROTOCOL_MCP + static LampController lamp(LAMP_GPIO); +#endif + } + +public: + ESP32_CGC_144() : + boot_button_(BOOT_BUTTON_GPIO), asr_button_(ASR_BUTTON_GPIO) { + InitializePowerManager(); + InitializePowerSaveTimer(); + InitializeSpi(); + InitializeSt7735Display(); + InitializeButtons(); + InitializeIot(); + GetBacklight()->RestoreBrightness(); + } + + virtual AudioCodec* GetAudioCodec() override + { + static NoAudioCodecSimplex audio_codec(AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE, + AUDIO_I2S_SPK_GPIO_BCLK, AUDIO_I2S_SPK_GPIO_LRCK, AUDIO_I2S_SPK_GPIO_DOUT, AUDIO_I2S_MIC_GPIO_SCK, AUDIO_I2S_MIC_GPIO_WS, AUDIO_I2S_MIC_GPIO_DIN); + 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 SetPowerSaveMode(bool enabled) override { + if (!enabled) { + power_save_timer_->WakeUp(); + } + WifiBoard::SetPowerSaveMode(enabled); + } +}; + +DECLARE_BOARD(ESP32_CGC_144); diff --git a/main/boards/esp32-cgc-144/power_manager.h b/main/boards/esp32-cgc-144/power_manager.h new file mode 100644 index 00000000..9576e302 --- /dev/null +++ b/main/boards/esp32-cgc-144/power_manager.h @@ -0,0 +1,186 @@ +#pragma once +#include +#include + +#include +#include +#include + + +class PowerManager { +private: + esp_timer_handle_t timer_handle_; + std::function on_charging_status_changed_; + std::function on_low_battery_status_changed_; + + gpio_num_t charging_pin_ = GPIO_NUM_NC; + std::vector adc_values_; + uint32_t battery_level_ = 0; + bool is_charging_ = false; + 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() { + // 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 (adc_values_.size() < kBatteryAdcDataCount) { + ReadBatteryAdcData(); + return; + } + + // 如果电池电量数据充足，则每 kBatteryAdcInterval 个 tick 读取一次电池电量数据 + ticks_++; + if (ticks_ % kBatteryAdcInterval == 0) { + ReadBatteryAdcData(); + } + } + + void ReadBatteryAdcData() { + int adc_value; + ESP_ERROR_CHECK(adc_oneshot_read(adc_handle_, ADC_CHANNEL_3, &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_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_3, &chan_config)); + } + + ~PowerManager() { + if (timer_handle_) { + esp_timer_stop(timer_handle_); + esp_timer_delete(timer_handle_); + } + if (adc_handle_) { + adc_oneshot_del_unit(adc_handle_); + } + } + + 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; + } +}; diff --git a/main/boards/esp32-cgc-144/power_manager_lite.h b/main/boards/esp32-cgc-144/power_manager_lite.h new file mode 100644 index 00000000..f088286d --- /dev/null +++ b/main/boards/esp32-cgc-144/power_manager_lite.h @@ -0,0 +1,185 @@ +#pragma once +#include +#include + +#include +#include +#include + + +class PowerManager { +private: + esp_timer_handle_t timer_handle_; + std::function on_charging_status_changed_; + std::function on_low_battery_status_changed_; + + gpio_num_t charging_pin_ = GPIO_NUM_NC; + std::vector adc_values_; + uint32_t battery_level_ = 0; + bool is_charging_ = false; + 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() { + // 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 (adc_values_.size() < kBatteryAdcDataCount) { + ReadBatteryAdcData(); + return; + } + + // 如果电池电量数据充足，则每 kBatteryAdcInterval 个 tick 读取一次电池电量数据 + ticks_++; + if (ticks_ % kBatteryAdcInterval == 0) { + ReadBatteryAdcData(); + } + } + + void ReadBatteryAdcData() { + int adc_value; + ESP_ERROR_CHECK(adc_oneshot_read(adc_handle_, ADC_CHANNEL_0, &adc_value)); //lite + // 将 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(); + + // lite定义电池电量区间 + const struct { + uint16_t adc; + uint8_t level; + } levels[] = { + {3000, 0}, + {3160, 20}, + {3320, 40}, + {3480, 60}, + {3640, 80}, + {3800, 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_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_0, &chan_config)); //lite + } + + ~PowerManager() { + if (timer_handle_) { + esp_timer_stop(timer_handle_); + esp_timer_delete(timer_handle_); + } + if (adc_handle_) { + adc_oneshot_del_unit(adc_handle_); + } + } + + 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; + } +}; diff --git a/main/boards/esp32-cgc/README.md b/main/boards/esp32-cgc/README.md index b8e611e3..95e9602b 100644 --- a/main/boards/esp32-cgc/README.md +++ b/main/boards/esp32-cgc/README.md @@ -1,5 +1,7 @@ # 主板开源地址： -[https://oshwhub.com/wdmomo/esp32-xiaozhi-kidpcb](https://oshwhub.com/wdmomo/esp32-xiaozhi-kidpcb) +- V1:[https://oshwhub.com/wdmomo/esp32-xiaozhi-kidpcb](https://oshwhub.com/wdmomo/esp32-xiaozhi-kidpcb) +- V2:[https://oshwhub.com/wdmomo/esp32-xiaozhi-kidpcb_copy](https://oshwhub.com/wdmomo/esp32-xiaozhi-kidpcb_copy) +- 更多介绍：[wdmomo.fun](https://www.wdmomo.fun:81/doc/index.html?file=001_%E8%AE%BE%E8%AE%A1%E9%A1%B9%E7%9B%AE/0001_%E5%B0%8F%E6%99%BAAI/002_ESP32-CGC%E5%BC%80%E5%8F%91%E6%9D%BF%E5%B0%8F%E6%99%BAAI) # 编译配置命令 diff --git a/main/boards/esp32-cgc/config.h b/main/boards/esp32-cgc/config.h index 289a2cad..2e27571a 100644 --- a/main/boards/esp32-cgc/config.h +++ b/main/boards/esp32-cgc/config.h @@ -31,6 +31,9 @@ #define BOOT_BUTTON_GPIO GPIO_NUM_0 #define ASR_BUTTON_GPIO GPIO_NUM_13 +// A MCP Test: Control a lamp +#define LAMP_GPIO GPIO_NUM_12 + #define DISPLAY_SDA_PIN GPIO_NUM_NC #define DISPLAY_SCL_PIN GPIO_NUM_NC diff --git a/main/boards/esp32-cgc/esp32_cgc_board.cc b/main/boards/esp32-cgc/esp32_cgc_board.cc index 6e45328f..b0190219 100644 --- a/main/boards/esp32-cgc/esp32_cgc_board.cc +++ b/main/boards/esp32-cgc/esp32_cgc_board.cc @@ -5,6 +5,8 @@ #include "application.h" #include "button.h" #include "config.h" +#include "mcp_server.h" +#include "lamp_controller.h" #include "iot/thing_manager.h" #include "led/single_led.h" @@ -152,9 +154,14 @@ private: // 物联网初始化，添加对 AI 可见设备 void InitializeIot() { +#if CONFIG_IOT_PROTOCOL_XIAOZHI auto& thing_manager = iot::ThingManager::GetInstance(); thing_manager.AddThing(iot::CreateThing("Speaker")); thing_manager.AddThing(iot::CreateThing("Screen")); + thing_manager.AddThing(iot::CreateThing("Lamp")); +#elif CONFIG_IOT_PROTOCOL_MCP + static LampController lamp(LAMP_GPIO); +#endif } public: