From 1c63934756830b5aa93bb8d263dd10685d80d6ef Mon Sep 17 00:00:00 2001 From: Y1hsiaochunnn <66012385+Y1hsiaochunnn@users.noreply.github.com> Date: Fri, 16 May 2025 02:41:35 +0800 Subject: [PATCH] Adjust ESP32-P4 chip compatibility Add Waveshare ESP32-P4-NANO board support (#589) * Added ESP32-P4 chip support * Add Waveshare ESP32-P4-NANO board support * Add Waveshare ESP32-P4-NANO board support * Add prefix "Waveshare" to waveshare products * Adjust the ESP32-P4-NANO README and fix the index link. * Update code style * Optimize code styles * Adjust to naming requirements * Adjust to naming requirements --- main/CMakeLists.txt | 2 + main/Kconfig.projbuild | 12 +- .../esp32-s3-touch-amoled-1.8.cc | 8 +- main/boards/waveshare-p4-nano/README.md | 43 ++++ main/boards/waveshare-p4-nano/config.h | 44 ++++ main/boards/waveshare-p4-nano/config.json | 11 + .../boards/waveshare-p4-nano/esp32-p4-nano.cc | 215 ++++++++++++++++++ main/display/lcd_display.cc | 66 ++++++ main/system_info.cc | 8 +- sdkconfig.defaults.esp32p4 | 25 ++ 10 files changed, 426 insertions(+), 8 deletions(-) create mode 100644 main/boards/waveshare-p4-nano/README.md create mode 100644 main/boards/waveshare-p4-nano/config.h create mode 100644 main/boards/waveshare-p4-nano/config.json create mode 100644 main/boards/waveshare-p4-nano/esp32-p4-nano.cc create mode 100644 sdkconfig.defaults.esp32p4 diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 8fe25ebb..09c7f01b 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -103,6 +103,8 @@ elseif(CONFIG_BOARD_TYPE_ESP32S3_Touch_LCD_1_46) set(BOARD_TYPE "esp32-s3-touch-lcd-1.46") elseif(CONFIG_BOARD_TYPE_ESP32S3_Touch_LCD_3_5) set(BOARD_TYPE "esp32-s3-touch-lcd-3.5") +elseif(CONFIG_BOARD_TYPE_ESP32P4_NANO) + set(BOARD_TYPE "waveshare-p4-nano") elseif(CONFIG_BOARD_TYPE_BREAD_COMPACT_WIFI_LCD) set(BOARD_TYPE "bread-compact-wifi-lcd") elseif(CONFIG_BOARD_TYPE_TUDOUZI) diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 68a50906..3b363855 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -100,6 +100,8 @@ choice BOARD_TYPE bool "Waveshare ESP32-S3-Touch-LCD-1.46" config BOARD_TYPE_ESP32S3_Touch_LCD_3_5 bool "Waveshare ESP32-S3-Touch-LCD-3.5" + config BOARD_TYPE_ESP32P4_NANO + bool "Waveshare ESP32-P4-NANO" config BOARD_TYPE_TUDOUZI bool "土豆子" config BOARD_TYPE_LILYGO_T_CIRCLE_S3 @@ -177,7 +179,7 @@ choice DISPLAY_OLED_TYPE endchoice choice DISPLAY_LCD_TYPE - depends on BOARD_TYPE_BREAD_COMPACT_WIFI_LCD || BOARD_TYPE_BREAD_COMPACT_ESP32_LCD || BOARD_TYPE_ESP32_CGC + depends on BOARD_TYPE_BREAD_COMPACT_WIFI_LCD || BOARD_TYPE_BREAD_COMPACT_ESP32_LCD || BOARD_TYPE_ESP32_CGC || BOARD_TYPE_ESP32P4_NANO prompt "LCD Type" default LCD_ST7789_240X320 help @@ -212,6 +214,10 @@ choice DISPLAY_LCD_TYPE bool "ILI9341, 分辨率240*320, 非IPS" config LCD_GC9A01_240X240 bool "GC9A01, 分辨率240*240, 圆屏" + config LCD_TYPE_800_1280_10_1_INCH + bool "Waveshare 101M-8001280-IPS-CT-K Display" + config LCD_TYPE_800_1280_10_1_INCH_A + bool "Waveshare 10.1-DSI-TOUCH-A Display" config LCD_CUSTOM bool "自定义屏幕参数" endchoice @@ -237,14 +243,14 @@ config USE_WECHAT_MESSAGE_STYLE config USE_WAKE_WORD_DETECT bool "启用唤醒词检测" default y - depends on IDF_TARGET_ESP32S3 && SPIRAM + depends on IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4 && SPIRAM help 需要 ESP32 S3 与 AFE 支持 config USE_AUDIO_PROCESSOR bool "启用音频降噪、增益处理" default y - depends on IDF_TARGET_ESP32S3 && SPIRAM + depends on IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4 && SPIRAM help 需要 ESP32 S3 与 AFE 支持 diff --git a/main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc b/main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc index 13cd0d04..d7a13970 100644 --- a/main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc +++ b/main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc @@ -25,7 +25,7 @@ #include #include -#define TAG "waveshare_amoled_1_8" +#define TAG "WaveshareEsp32s3TouchAMOLED1inch8" LV_FONT_DECLARE(font_puhui_30_4); LV_FONT_DECLARE(font_awesome_30_4); @@ -122,7 +122,7 @@ protected: } }; -class waveshare_amoled_1_8 : public WifiBoard { +class WaveshareEsp32s3TouchAMOLED1inch8 : public WifiBoard { private: i2c_master_bus_handle_t codec_i2c_bus_; Pmic* pmic_ = nullptr; @@ -298,7 +298,7 @@ private: } public: - waveshare_amoled_1_8() : + WaveshareEsp32s3TouchAMOLED1inch8() : boot_button_(BOOT_BUTTON_GPIO) { InitializePowerSaveTimer(); InitializeCodecI2c(); @@ -347,4 +347,4 @@ public: } }; -DECLARE_BOARD(waveshare_amoled_1_8); +DECLARE_BOARD(WaveshareEsp32s3TouchAMOLED1inch8); diff --git a/main/boards/waveshare-p4-nano/README.md b/main/boards/waveshare-p4-nano/README.md new file mode 100644 index 00000000..580785c1 --- /dev/null +++ b/main/boards/waveshare-p4-nano/README.md @@ -0,0 +1,43 @@ +# Waveshare ESP32-P4-NANO + + +[ESP32-P4-NANO](https://www.waveshare.com/esp32-p4-nano.htm) is a small size and highly integrated development board designed by waveshare electronics based on ESP32-P4 chip + + + +## Display Page + + +### Recommended display screen + +| Product ID | Dependency | tested | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------|--------| +| [10.1-DSI-TOUCH-A](https://www.waveshare.com/10.1-dsi-touch-a.htm)
| [waveshare/esp_lcd_jd9365_10_1](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_jd9365_10_1) | ✅ | +| [101M-8001280-IPS-CT-K](https://www.waveshare.com/101m-8001280-ips-ct-k.htm)
| [waveshare/esp_lcd_jd9365_10_1](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_jd9365_10_1) | ✅ | + +### Common Raspberry adapter screen + +**These displays are supported on [ESP32-P4-NANO BSP](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/bsp/esp32_p4_nano), but not on xiaozhi-esp32** + +
+View full display + +| Product ID | Dependency | tested | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------|--------| +| [2.8inch DSI LCD](https://www.waveshare.com/2.8inch-dsi-lcd.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [3.4inch DSI LCD (C)](https://www.waveshare.com/3.4inch-dsi-lcd-c.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [4inch DSI LCD (C)](https://www.waveshare.com/4inch-dsi-lcd-c.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [4inch DSI LCD](https://www.waveshare.com/4inch-dsi-lcd.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [5inch DSI LCD (D)](https://www.waveshare.com/5inch-dsi-lcd-d.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [6.25inch DSI LCD](https://www.waveshare.com/6.25inch-dsi-lcd.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [5inch DSI LCD (C)](https://www.waveshare.com/5inch-dsi-lcd-c.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [7inch DSI LCD (C)](https://www.waveshare.com/7inch-dsi-lcd-c-with-case-a.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [7.9inch DSI LCD](https://www.waveshare.com/7.9inch-dsi-lcd.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [7inch DSI LCD (E)](https://www.waveshare.com/7inch-dsi-lcd-e.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [8inch DSI LCD (C)](https://www.waveshare.com/8inch-dsi-lcd-c.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [10.1inch DSI LCD (C)](https://www.waveshare.com/10.1inch-dsi-lcd-c.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [8.8inch DSI LCD](https://www.waveshare.com/8.8inch-dsi-lcd.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [11.9inch DSI LCD](https://www.waveshare.com/11.9inch-dsi-lcd.htm)
| [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 | +| [7-DSI-TOUCH-A](https://www.waveshare.com/7-dsi-touch-a.htm)
| [waveshare/esp_lcd_ili9881c](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_ili9881c) | 🕒 | + +
\ No newline at end of file diff --git a/main/boards/waveshare-p4-nano/config.h b/main/boards/waveshare-p4-nano/config.h new file mode 100644 index 00000000..8fb9cccf --- /dev/null +++ b/main/boards/waveshare-p4-nano/config.h @@ -0,0 +1,44 @@ +#ifndef _BOARD_CONFIG_H_ +#define _BOARD_CONFIG_H_ + +#include + +#define AUDIO_INPUT_SAMPLE_RATE 24000 +#define AUDIO_OUTPUT_SAMPLE_RATE 24000 + +#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_13 +#define AUDIO_I2S_GPIO_WS GPIO_NUM_10 +#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_12 +#define AUDIO_I2S_GPIO_DIN GPIO_NUM_11 +#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_9 + +#define AUDIO_CODEC_PA_PIN GPIO_NUM_53 +#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_7 +#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_8 +#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR + +#define BOOT_BUTTON_GPIO GPIO_NUM_35 + +#define DISPLAY_WIDTH 800 +#define DISPLAY_HEIGHT 1280 + +#define LCD_BIT_PER_PIXEL (16) +#define PIN_NUM_LCD_RST GPIO_NUM_NC + +#define DELAY_TIME_MS (3000) +#define LCD_MIPI_DSI_LANE_NUM (2) // 2 data lanes + +#define MIPI_DSI_PHY_PWR_LDO_CHAN (3) +#define MIPI_DSI_PHY_PWR_LDO_VOLTAGE_MV (2500) + +#define DISPLAY_SWAP_XY false +#define DISPLAY_MIRROR_X false +#define DISPLAY_MIRROR_Y false + +#define DISPLAY_OFFSET_X 0 +#define DISPLAY_OFFSET_Y 0 + +#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_NC +#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false + +#endif // _BOARD_CONFIG_H_ diff --git a/main/boards/waveshare-p4-nano/config.json b/main/boards/waveshare-p4-nano/config.json new file mode 100644 index 00000000..122ce9c9 --- /dev/null +++ b/main/boards/waveshare-p4-nano/config.json @@ -0,0 +1,11 @@ +{ + "target": "esp32p4", + "builds": [ + { + "name": "waveshare-p4-nano", + "sdkconfig_append": [ + "CONFIG_USE_WECHAT_MESSAGE_STYLE=y" + ] + } + ] +} \ No newline at end of file diff --git a/main/boards/waveshare-p4-nano/esp32-p4-nano.cc b/main/boards/waveshare-p4-nano/esp32-p4-nano.cc new file mode 100644 index 00000000..507cdabf --- /dev/null +++ b/main/boards/waveshare-p4-nano/esp32-p4-nano.cc @@ -0,0 +1,215 @@ +#include "wifi_board.h" +#include "audio_codecs/es8311_audio_codec.h" +#include "application.h" +#include "display/lcd_display.h" +// #include "display/no_display.h" +#include "button.h" +#include "config.h" +#include "iot/thing_manager.h" + +#include "esp_lcd_panel_ops.h" +#include "esp_lcd_mipi_dsi.h" +#include "esp_ldo_regulator.h" + +#include "esp_lcd_mipi_dsi.h" +#include "esp_lcd_jd9365_10_1.h" + +#include +#include +#include + +#define TAG "WaveshareEsp32p4nano" + +LV_FONT_DECLARE(font_puhui_20_4); +LV_FONT_DECLARE(font_awesome_20_4); + +// TODO: Backlight control and i2c drive conflict, has not been resolved +class CustomBacklight : public Backlight { +public: + CustomBacklight(i2c_master_bus_handle_t i2c_handle) + : Backlight(), i2c_handle_(i2c_handle) {} + +protected: + i2c_master_bus_handle_t i2c_handle_; + + virtual void SetBrightnessImpl(uint8_t brightness) override { + uint8_t i2c_address = 0x45; // 7-bit address +#if CONFIG_LCD_TYPE_800_1280_10_1_INCH + uint8_t reg = 0x86; +#elif CONFIG_LCD_TYPE_800_1280_10_1_INCH_A + uint8_t reg = 0x96; +#endif + uint8_t data[2] = {reg, brightness}; + + i2c_master_dev_handle_t dev_handle; + i2c_device_config_t dev_cfg = { + .dev_addr_length = I2C_ADDR_BIT_LEN_7, + .device_address = i2c_address, + .scl_speed_hz = 100000, + }; + + esp_err_t err = i2c_master_bus_add_device(i2c_handle_, &dev_cfg, &dev_handle); + if (err != ESP_OK) { + ESP_LOGE(TAG, "Failed to add I2C device: %s", esp_err_to_name(err)); + return; + } + + err = i2c_master_transmit(dev_handle, data, sizeof(data), -1); + if (err != ESP_OK) { + ESP_LOGE(TAG, "Failed to transmit brightness: %s", esp_err_to_name(err)); + } else { + ESP_LOGI(TAG, "Backlight brightness set to %u", brightness); + } + + // i2c_master_bus_rm_device(dev_handle); + } +}; + +class WaveshareEsp32p4nano : public WifiBoard { +private: + i2c_master_bus_handle_t codec_i2c_bus_; + Button boot_button_; + LcdDisplay *display__; + // CustomBacklight *backlight_; + + void InitializeCodecI2c() { + // Initialize I2C peripheral + i2c_master_bus_config_t i2c_bus_cfg = { + .i2c_port = I2C_NUM_1, + .sda_io_num = AUDIO_CODEC_I2C_SDA_PIN, + .scl_io_num = AUDIO_CODEC_I2C_SCL_PIN, + .clk_source = I2C_CLK_SRC_DEFAULT, + .glitch_ignore_cnt = 7, + .intr_priority = 0, + .trans_queue_depth = 0, + .flags = { + .enable_internal_pullup = 1, + }, + }; + ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &codec_i2c_bus_)); + } + + static esp_err_t bsp_enable_dsi_phy_power(void) { +#if MIPI_DSI_PHY_PWR_LDO_CHAN > 0 + // Turn on the power for MIPI DSI PHY, so it can go from "No Power" state to "Shutdown" state + static esp_ldo_channel_handle_t phy_pwr_chan = NULL; + esp_ldo_channel_config_t ldo_cfg = { + .chan_id = MIPI_DSI_PHY_PWR_LDO_CHAN, + .voltage_mv = MIPI_DSI_PHY_PWR_LDO_VOLTAGE_MV, + }; + esp_ldo_acquire_channel(&ldo_cfg, &phy_pwr_chan); + ESP_LOGI(TAG, "MIPI DSI PHY Powered on"); +#endif // BSP_MIPI_DSI_PHY_PWR_LDO_CHAN > 0 + + return ESP_OK; + } + + void InitializeLCD() { + bsp_enable_dsi_phy_power(); + esp_lcd_panel_io_handle_t io = NULL; + esp_lcd_panel_handle_t disp_panel = NULL; + + esp_lcd_dsi_bus_handle_t mipi_dsi_bus = NULL; + esp_lcd_dsi_bus_config_t bus_config = JD9365_PANEL_BUS_DSI_2CH_CONFIG(); + esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus); + + ESP_LOGI(TAG, "Install MIPI DSI LCD control panel"); + // we use DBI interface to send LCD commands and parameters + esp_lcd_dbi_io_config_t dbi_config = JD9365_PANEL_IO_DBI_CONFIG(); + esp_lcd_new_panel_io_dbi(mipi_dsi_bus, &dbi_config, &io); + + esp_lcd_dpi_panel_config_t dpi_config = { + .dpi_clk_src = MIPI_DSI_DPI_CLK_SRC_DEFAULT, + .dpi_clock_freq_mhz = 80, + .pixel_format = LCD_COLOR_PIXEL_FORMAT_RGB565, + .num_fbs = 1, + .video_timing = { + .h_size = 800, + .v_size = 1280, + .hsync_pulse_width = 20, + .hsync_back_porch = 20, + .hsync_front_porch = 40, + .vsync_pulse_width = 10, + .vsync_back_porch = 4, + .vsync_front_porch = 30, + }, + .flags = { + .use_dma2d = true, + }, + }; + + jd9365_vendor_config_t vendor_config = { + + .mipi_config = { + .dsi_bus = mipi_dsi_bus, + .dpi_config = &dpi_config, + .lane_num = 2, + }, + .flags = { + .use_mipi_interface = 1, + }, + }; + + const esp_lcd_panel_dev_config_t lcd_dev_config = { + .reset_gpio_num = PIN_NUM_LCD_RST, + .rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB, + .bits_per_pixel = 16, + .vendor_config = &vendor_config, + }; + esp_lcd_new_panel_jd9365(io, &lcd_dev_config, &disp_panel); + esp_lcd_panel_reset(disp_panel); + esp_lcd_panel_init(disp_panel); + + display__ = new MipiLcdDisplay(io, disp_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(), + }); + // backlight_ = new CustomBacklight(codec_i2c_bus_); + // backlight_->RestoreBrightness(); + } + + void InitializeButtons() { + boot_button_.OnClick([this]() { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) { + ResetWifiConfiguration(); + } + app.ToggleChatState(); }); + } + + // 物联网初始化，添加对 AI 可见设备 + void InitializeIot() { + auto &thing_manager = iot::ThingManager::GetInstance(); + thing_manager.AddThing(iot::CreateThing("Speaker")); + // thing_manager.AddThing(iot::CreateThing("Screen")); + } + +public: + WaveshareEsp32p4nano() : + boot_button_(BOOT_BUTTON_GPIO) { + InitializeCodecI2c(); + InitializeIot(); + InitializeLCD(); + InitializeButtons(); + } + + virtual AudioCodec *GetAudioCodec() override { + static Es8311AudioCodec audio_codec(codec_i2c_bus_, I2C_NUM_1, 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 { + // return backlight_; + // } +}; + +DECLARE_BOARD(WaveshareEsp32p4nano); diff --git a/main/display/lcd_display.cc b/main/display/lcd_display.cc index 54230e45..c5a66c33 100644 --- a/main/display/lcd_display.cc +++ b/main/display/lcd_display.cc @@ -225,6 +225,72 @@ RgbLcdDisplay::RgbLcdDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_h SetupUI(); } +MipiLcdDisplay::MipiLcdDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, + int width, int height, int offset_x, int offset_y, + bool mirror_x, bool mirror_y, bool swap_xy, + DisplayFonts fonts) + : LcdDisplay(panel_io, panel, fonts) { + width_ = width; + height_ = height; + + // Set the display to on + ESP_LOGI(TAG, "Turning display on"); + ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel_, true)); + + ESP_LOGI(TAG, "Initialize LVGL library"); + lv_init(); + + ESP_LOGI(TAG, "Initialize LVGL port"); + lvgl_port_cfg_t port_cfg = ESP_LVGL_PORT_INIT_CONFIG(); + lvgl_port_init(&port_cfg); + + ESP_LOGI(TAG, "Adding LCD screen"); + const lvgl_port_display_cfg_t disp_cfg = { + .io_handle = panel_io, + .panel_handle = panel, + .control_handle = nullptr, + .buffer_size = static_cast(width_ * 50), + .double_buffer = false, + .hres = static_cast(width_), + .vres = static_cast(height_), + .monochrome = false, + /* Rotation values must be same as used in esp_lcd for initial settings of the screen */ + .rotation = { + .swap_xy = swap_xy, + .mirror_x = mirror_x, + .mirror_y = mirror_y, + }, + .flags = { + .buff_dma = true, + .buff_spiram =false, + .sw_rotate = false, + }, + }; + + const lvgl_port_display_dsi_cfg_t dpi_cfg = { + .flags = { + .avoid_tearing = false, + } + }; + display_ = lvgl_port_add_disp_dsi(&disp_cfg, &dpi_cfg); + if (display_ == nullptr) { + ESP_LOGE(TAG, "Failed to add display"); + return; + } + + if (offset_x != 0 || offset_y != 0) { + lv_display_set_offset(display_, offset_x, offset_y); + } + + if (current_theme_name_ == "dark") { + current_theme = DARK_THEME; + } else if (current_theme_name_ == "light") { + current_theme = LIGHT_THEME; + } + + SetupUI(); +} + LcdDisplay::~LcdDisplay() { // 然后再清理 LVGL 对象 if (content_ != nullptr) { diff --git a/main/system_info.cc b/main/system_info.cc index 10778caa..7f0ebb1c 100644 --- a/main/system_info.cc +++ b/main/system_info.cc @@ -8,7 +8,9 @@ #include #include #include - +#if CONFIG_IDF_TARGET_ESP32P4 +#include "esp_wifi_remote.h" +#endif #define TAG "SystemInfo" @@ -31,7 +33,11 @@ size_t SystemInfo::GetFreeHeapSize() { std::string SystemInfo::GetMacAddress() { uint8_t mac[6]; +#if CONFIG_IDF_TARGET_ESP32P4 + esp_wifi_get_mac(WIFI_IF_STA, mac); +#else esp_read_mac(mac, ESP_MAC_WIFI_STA); +#endif char mac_str[18]; snprintf(mac_str, sizeof(mac_str), "%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); return std::string(mac_str); diff --git a/sdkconfig.defaults.esp32p4 b/sdkconfig.defaults.esp32p4 new file mode 100644 index 00000000..a42a8c86 --- /dev/null +++ b/sdkconfig.defaults.esp32p4 @@ -0,0 +1,25 @@ +CONFIG_IDF_TARGET="esp32p4" +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y +CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y +CONFIG_PARTITION_TABLE_CUSTOM=y +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" + +CONFIG_SPIRAM=y +CONFIG_SPIRAM_SPEED_200M=y +CONFIG_SPIRAM_XIP_FROM_PSRAM=y +CONFIG_ESP_MAIN_TASK_STACK_SIZE=10240 +CONFIG_FREERTOS_HZ=1000 +CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y +CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y + +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 +CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y +CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=49152 +CONFIG_SPIRAM_MEMTEST=n +CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y + +CONFIG_SLAVE_IDF_TARGET_ESP32C6=y + +CONFIG_SR_WN_WN9_NIHAOXIAOZHI_TTS=y + +CONFIG_IDF_EXPERIMENTAL_FEATURES=y