From 018383091587f8fc36bf558dbe769fd1ca1f68cf Mon Sep 17 00:00:00 2001 From: liyuaxue <3273697182@qq.com> Date: Wed, 21 May 2025 22:09:12 +0800 Subject: [PATCH] =?UTF-8?q?add=20zhengchen=5Fml307=20board=EF=BC=88?= =?UTF-8?q?=E5=BE=81=E8=BE=B0=E7=A7=91=E6=8A=80=EF=BC=89=20(#641)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add zhengchen_ml307 board * add boards_http --- main/CMakeLists.txt | 2 + main/Kconfig.projbuild | 2 + main/boards/zhengchen-1.54tft-ml307/README.md | 45 ++++ main/boards/zhengchen-1.54tft-ml307/config.h | 42 ++++ .../zhengchen-1.54tft-ml307/config.json | 9 + .../zhengchen-1.54tft-ml307.cc | 232 ++++++++++++++++++ main/boards/zhengchen-1.54tft-wifi/README.md | 6 + 7 files changed, 338 insertions(+) create mode 100644 main/boards/zhengchen-1.54tft-ml307/README.md create mode 100644 main/boards/zhengchen-1.54tft-ml307/config.h create mode 100644 main/boards/zhengchen-1.54tft-ml307/config.json create mode 100644 main/boards/zhengchen-1.54tft-ml307/zhengchen-1.54tft-ml307.cc diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 4a319803..c08e560b 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -165,6 +165,8 @@ 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) set(BOARD_TYPE "zhengchen-1.54tft-wifi") +elseif(CONFIG_BOARD_TYPE_ZHENGCHEN_1_54TFT_ML307) + set(BOARD_TYPE "zhengchen-1.54tft-ml307") endif() file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index c4e0e545..1523b1bc 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -158,6 +158,8 @@ choice BOARD_TYPE bool "乐鑫ESP S3 LCD EV Board开发板" config BOARD_TYPE_ZHENGCHEN_1_54TFT_WIFI bool "征辰科技1.54(WIFI)" + config BOARD_TYPE_ZHENGCHEN_1_54TFT_ML307 + bool "征辰科技1.54(ML307)" endchoice choice ESP_S3_LCD_EV_Board_Version_TYPE diff --git a/main/boards/zhengchen-1.54tft-ml307/README.md b/main/boards/zhengchen-1.54tft-ml307/README.md new file mode 100644 index 00000000..a7f289b6 --- /dev/null +++ b/main/boards/zhengchen-1.54tft-ml307/README.md @@ -0,0 +1,45 @@ +# 产品相关介绍网址 + +```http +https://e.tb.cn/h.6Gl2LC7rsrswQZp?tk=qFuaV9hzh0k CZ356 +``` + +# 编译配置命令 + +**配置编译目标为 ESP32S3：** + +```bash +idf.py set-target esp32s3 +``` + +**打开 menuconfig：** + +```bash +idf.py menuconfig +``` + +**选择板子：** + +``` +Xiaozhi Assistant -> Board Type -> zhengchen-1.54tft-ml307 +``` + +``` + +**编译：** + +bash +idf.py build +``` + +**下载：** +idf.py build flash monitor + +进行下载和显示日志 + + +**固件生成：** + +```bash +idf.py merge-bin +``` diff --git a/main/boards/zhengchen-1.54tft-ml307/config.h b/main/boards/zhengchen-1.54tft-ml307/config.h new file mode 100644 index 00000000..888a0523 --- /dev/null +++ b/main/boards/zhengchen-1.54tft-ml307/config.h @@ -0,0 +1,42 @@ + +#ifndef _BOARD_CONFIG_H_ +#define _BOARD_CONFIG_H_ + +#include + +#define AUDIO_INPUT_SAMPLE_RATE 16000 +#define AUDIO_OUTPUT_SAMPLE_RATE 24000 + +#define AUDIO_I2S_MIC_GPIO_WS GPIO_NUM_4 +#define AUDIO_I2S_MIC_GPIO_SCK GPIO_NUM_5 +#define AUDIO_I2S_MIC_GPIO_DIN GPIO_NUM_6 +#define AUDIO_I2S_SPK_GPIO_DOUT GPIO_NUM_7 +#define AUDIO_I2S_SPK_GPIO_BCLK GPIO_NUM_15 +#define AUDIO_I2S_SPK_GPIO_LRCK GPIO_NUM_16 + +#define BOOT_BUTTON_GPIO GPIO_NUM_0 +#define VOLUME_UP_BUTTON_GPIO GPIO_NUM_10 +#define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_39 + +#define DISPLAY_SDA GPIO_NUM_41 +#define DISPLAY_SCL GPIO_NUM_42 +#define DISPLAY_RES GPIO_NUM_45 +#define DISPLAY_DC GPIO_NUM_40 +#define DISPLAY_CS GPIO_NUM_21 + +#define DISPLAY_WIDTH 240 +#define DISPLAY_HEIGHT 240 +#define DISPLAY_SWAP_XY false +#define DISPLAY_MIRROR_X false +#define DISPLAY_MIRROR_Y false +#define BACKLIGHT_INVERT false +#define DISPLAY_OFFSET_X 0 +#define DISPLAY_OFFSET_Y 0 + +#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_20 +#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false + +#define ML307_RX_PIN GPIO_NUM_11 +#define ML307_TX_PIN GPIO_NUM_12 + +#endif // _BOARD_CONFIG_H_ diff --git a/main/boards/zhengchen-1.54tft-ml307/config.json b/main/boards/zhengchen-1.54tft-ml307/config.json new file mode 100644 index 00000000..6e17be76 --- /dev/null +++ b/main/boards/zhengchen-1.54tft-ml307/config.json @@ -0,0 +1,9 @@ +{ + "target": "esp32s3", + "builds": [ + { + "name": "zhengchen-1.54tft-ml307", + "sdkconfig_append": [] + } + ] +} \ No newline at end of file diff --git a/main/boards/zhengchen-1.54tft-ml307/zhengchen-1.54tft-ml307.cc b/main/boards/zhengchen-1.54tft-ml307/zhengchen-1.54tft-ml307.cc new file mode 100644 index 00000000..7f563026 --- /dev/null +++ b/main/boards/zhengchen-1.54tft-ml307/zhengchen-1.54tft-ml307.cc @@ -0,0 +1,232 @@ +#include "dual_network_board.h" +#include "audio_codecs/no_audio_codec.h" +#include "../zhengchen-1.54tft-wifi/zhengchen_lcd_display.h" +#include "system_reset.h" +#include "application.h" +#include "button.h" +#include "config.h" +#include "power_save_timer.h" +#include "iot/thing_manager.h" +#include "led/single_led.h" +#include "assets/lang_config.h" +#include "../zhengchen-1.54tft-wifi/power_manager.h" + +#include +#include +#include + +#include +#include + +#define TAG "ZHENGCHEN_1_54TFT_ML307" + +LV_FONT_DECLARE(font_puhui_20_4); +LV_FONT_DECLARE(font_awesome_20_4); + + +class ZHENGCHEN_1_54TFT_ML307 : public DualNetworkBoard { +private: + Button boot_button_; + Button volume_up_button_; + Button volume_down_button_; + ZHENGCHEN_LcdDisplay* display_; + PowerSaveTimer* power_save_timer_; + PowerManager* power_manager_; + esp_lcd_panel_io_handle_t panel_io_ = nullptr; + esp_lcd_panel_handle_t panel_ = nullptr; + + void InitializePowerManager() { + power_manager_ = new PowerManager(GPIO_NUM_9); + power_manager_->OnTemperatureChanged([this](float chip_temp) { + display_->UpdateHighTempWarning(chip_temp); + }); + 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_2); + rtc_gpio_set_direction(GPIO_NUM_2, RTC_GPIO_MODE_OUTPUT_ONLY); + rtc_gpio_set_level(GPIO_NUM_2, 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_->SetEnabled(true); + } + + void InitializeSpi() { + spi_bus_config_t buscfg = {}; + buscfg.mosi_io_num = DISPLAY_SDA; + buscfg.miso_io_num = GPIO_NUM_NC; + buscfg.sclk_io_num = DISPLAY_SCL; + 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]() { + power_save_timer_->WakeUp(); + auto& app = Application::GetInstance(); + if (GetNetworkType() == NetworkType::WIFI) { + if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) { + // cast to WifiBoard + auto& wifi_board = static_cast(GetCurrentBoard()); + wifi_board.ResetWifiConfiguration(); + } + } + app.ToggleChatState(); + }); + + boot_button_.OnLongPress([this]() { + SwitchNetworkType(); + }); + + volume_up_button_.OnClick([this]() { + power_save_timer_->WakeUp(); + 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/10)); + }); + + volume_up_button_.OnLongPress([this]() { + power_save_timer_->WakeUp(); + GetAudioCodec()->SetOutputVolume(100); + GetDisplay()->ShowNotification(Lang::Strings::MAX_VOLUME); + }); + + volume_down_button_.OnClick([this]() { + power_save_timer_->WakeUp(); + 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/10)); + }); + + volume_down_button_.OnLongPress([this]() { + power_save_timer_->WakeUp(); + GetAudioCodec()->SetOutputVolume(0); + GetDisplay()->ShowNotification(Lang::Strings::MUTED); + }); + } + + void InitializeSt7789Display() { + ESP_LOGD(TAG, "Install panel IO"); + esp_lcd_panel_io_spi_config_t io_config = {}; + io_config.cs_gpio_num = DISPLAY_CS; + io_config.dc_gpio_num = DISPLAY_DC; + io_config.spi_mode = 3; + io_config.pclk_hz = 80 * 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_RES; + 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_ERROR_CHECK(esp_lcd_panel_reset(panel_)); + ESP_ERROR_CHECK(esp_lcd_panel_init(panel_)); + ESP_ERROR_CHECK(esp_lcd_panel_swap_xy(panel_, DISPLAY_SWAP_XY)); + ESP_ERROR_CHECK(esp_lcd_panel_mirror(panel_, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y)); + ESP_ERROR_CHECK(esp_lcd_panel_invert_color(panel_, true)); + + display_ = new ZHENGCHEN_LcdDisplay(panel_io_, panel_, DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, + DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY, + { + .text_font = &font_puhui_20_4, + .icon_font = &font_awesome_20_4, + .emoji_font = font_emoji_64_init(), + }); + display_->SetupHighTempWarningPopup(); + } + + void InitializeIot() { + auto& thing_manager = iot::ThingManager::GetInstance(); + thing_manager.AddThing(iot::CreateThing("Speaker")); + thing_manager.AddThing(iot::CreateThing("Screen")); + thing_manager.AddThing(iot::CreateThing("Battery")); + } + +public: + ZHENGCHEN_1_54TFT_ML307() : + DualNetworkBoard(ML307_TX_PIN, ML307_RX_PIN, 4096), + boot_button_(BOOT_BUTTON_GPIO), + volume_up_button_(VOLUME_UP_BUTTON_GPIO), + volume_down_button_(VOLUME_DOWN_BUTTON_GPIO) { + InitializePowerManager(); + InitializePowerSaveTimer(); + InitializeSpi(); + InitializeButtons(); + InitializeSt7789Display(); + 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 bool GetTemperature(float& esp32temp) override { + esp32temp = power_manager_->GetTemperature(); + return true; + } + + virtual void SetPowerSaveMode(bool enabled) override { + if (!enabled) { + power_save_timer_->WakeUp(); + } + DualNetworkBoard::SetPowerSaveMode(enabled); + } +}; + +DECLARE_BOARD(ZHENGCHEN_1_54TFT_ML307); diff --git a/main/boards/zhengchen-1.54tft-wifi/README.md b/main/boards/zhengchen-1.54tft-wifi/README.md index 7d3a3e9f..20bd9a6f 100644 --- a/main/boards/zhengchen-1.54tft-wifi/README.md +++ b/main/boards/zhengchen-1.54tft-wifi/README.md @@ -1,3 +1,9 @@ +# 产品相关介绍网址 + +```http +https://e.tb.cn/h.6Gl2LC7rsrswQZp?tk=qFuaV9hzh0k CZ356 +``` + # 编译配置命令 **配置编译目标为 ESP32S3：**