From 022d9848dedad646c48feebb7002d3956d7bcb96 Mon Sep 17 00:00:00 2001 From: radmir <39234121+mrrdmr@users.noreply.github.com> Date: Wed, 1 Apr 2026 07:46:53 +0300 Subject: [PATCH] Add freenove-esp32s3-display-2.8-lcd (#1876) * add freenove-esp32s3-display-2.8-lcd from https://github.com/Freenove/xiaozhi-esp32 and updated to v2.2.4 * add Freenove_ESP32S3_DISPLAY_2_8_LCD to configs * Update from manufacturer https://github.com/Freenove/xiaozhi-esp32/tree/New * Delete main/boards/freenove-esp32s3-display-2.8-lcd/_static/ReadMe/media-kit-2.8-lcd-top.jpg orphan * Delete main/boards/freenove-esp32s3-display-2.8-lcd/_static/ReadMe/media-kit-2.8-lcd-sideview.jpg orphan * Delete main/boards/freenove-esp32s3-display-2.8-lcd/_static/ReadMe directory * readme update --- main/CMakeLists.txt | 5 + main/Kconfig.projbuild | 3 + .../ReadMe.md | 5 + .../freenove-esp32s3-display-2.8-lcd/config.h | 53 +++++++ .../config.json | 15 ++ .../freenove-esp32s3-display-2.8-lcd.cc | 140 ++++++++++++++++++ 6 files changed, 221 insertions(+) create mode 100644 main/boards/freenove-esp32s3-display-2.8-lcd/ReadMe.md create mode 100644 main/boards/freenove-esp32s3-display-2.8-lcd/config.h create mode 100644 main/boards/freenove-esp32s3-display-2.8-lcd/config.json create mode 100644 main/boards/freenove-esp32s3-display-2.8-lcd/freenove-esp32s3-display-2.8-lcd.cc diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 69ab780..822503f 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -752,6 +752,11 @@ elseif(CONFIG_BOARD_TYPE_HU_087) set(BOARD_TYPE "hu-087") set(BUILTIN_TEXT_FONT font_puhui_basic_14_1) set(BUILTIN_ICON_FONT font_awesome_14_1) +elseif(CONFIG_BOARD_TYPE_Freenove_ESP32S3_DISPLAY_2_8_LCD) + set(BOARD_TYPE "freenove-esp32s3-display-2.8-lcd") + set(BUILTIN_TEXT_FONT font_puhui_basic_20_4) + set(BUILTIN_ICON_FONT font_awesome_20_4) + set(DEFAULT_EMOJI_COLLECTION twemoji_64) endif() if(MANUFACTURER) diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index f807aeb..d8a2d1a 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -530,6 +530,9 @@ choice BOARD_TYPE config BOARD_TYPE_HU_087 bool "HU-087" depends on IDF_TARGET_ESP32S3 + config BOARD_TYPE_Freenove_ESP32S3_DISPLAY_2_8_LCD + bool "Freenove ESP32S3 Display 2.8 LCD" + depends on IDF_TARGET_ESP32S3 endchoice choice diff --git a/main/boards/freenove-esp32s3-display-2.8-lcd/ReadMe.md b/main/boards/freenove-esp32s3-display-2.8-lcd/ReadMe.md new file mode 100644 index 0000000..391529c --- /dev/null +++ b/main/boards/freenove-esp32s3-display-2.8-lcd/ReadMe.md @@ -0,0 +1,5 @@ +# Freenove ESP32-S3 ESP32 S3 Capacitive Touch Display CYD WiFi BT, 2.8 Inch 240x320 IPS Screen + +[product](https://store.freenove.com/products/fnk0104) + +Official github: [freenove-esp32s3-display-2.8-lcd](https://github.com/Freenove/Freenove_ESP32_S3_Display) \ No newline at end of file diff --git a/main/boards/freenove-esp32s3-display-2.8-lcd/config.h b/main/boards/freenove-esp32s3-display-2.8-lcd/config.h new file mode 100644 index 0000000..0f315f9 --- /dev/null +++ b/main/boards/freenove-esp32s3-display-2.8-lcd/config.h @@ -0,0 +1,53 @@ +#ifndef _BOARD_CONFIG_H_ +#define _BOARD_CONFIG_H_ + +#include + +#define AUDIO_INPUT_SAMPLE_RATE 24000 +#define AUDIO_OUTPUT_SAMPLE_RATE 24000 + +//音频iis部分 +#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_4 //MCLK +#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_5 //SCK +#define AUDIO_I2S_GPIO_DIN GPIO_NUM_6 //DIN +#define AUDIO_I2S_GPIO_WS GPIO_NUM_7 //LRC +#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_8 //DOUT +#define AUDIO_CODEC_PA_PIN GPIO_NUM_1 //PA + +//音频iic部分 +#define AUDIO_CODEC_I2C_NUM I2C_NUM_0 +#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_15 +#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_16 +#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR + +//boot引脚 +#define BOOT_BUTTON_GPIO GPIO_NUM_0 +#define BUILTIN_LED_GPIO GPIO_NUM_42 + +//屏幕显示部分 +#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_45 + +#define DISPLAY_RST_PIN GPIO_NUM_NC +#define DISPLAY_SCK_PIN GPIO_NUM_12 +#define DISPLAY_DC_PIN GPIO_NUM_46 +#define DISPLAY_CS_PIN GPIO_NUM_10 +#define DISPLAY_MOSI_PIN GPIO_NUM_11 +#define DISPLAY_MIS0_PIN GPIO_NUM_13 +#define DISPLAY_SPI_SCLK_HZ (20 * 1000 * 1000) + +#define LCD_SPI_HOST SPI3_HOST + +#define LCD_TYPE_ILI9341_SERIAL +#define DISPLAY_WIDTH 320 +#define DISPLAY_HEIGHT 240 +#define DISPLAY_MIRROR_X false +#define DISPLAY_MIRROR_Y false +#define DISPLAY_SWAP_XY true +#define DISPLAY_INVERT_COLOR true +#define DISPLAY_RGB_ORDER LCD_RGB_ELEMENT_ORDER_BGR +#define DISPLAY_OFFSET_X 0 +#define DISPLAY_OFFSET_Y 0 +#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false +#define DISPLAY_SPI_MODE 0 + +#endif // _BOARD_CONFIG_H_ diff --git a/main/boards/freenove-esp32s3-display-2.8-lcd/config.json b/main/boards/freenove-esp32s3-display-2.8-lcd/config.json new file mode 100644 index 0000000..0d60753 --- /dev/null +++ b/main/boards/freenove-esp32s3-display-2.8-lcd/config.json @@ -0,0 +1,15 @@ +{ + "target": "esp32s3", + "builds": [ + { + "name": "freenove-esp32s3-display-2.8-lcd", + "sdkconfig_append": [ + "CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y", + "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/16m.csv\"", + "CONFIG_LANGUAGE_EN_US=y" + "CONFIG_SR_WN_WN9S_HIESP=y", + "CONFIG_SR_WN_WN9_HIESP=y" + ] + } + ] +} \ No newline at end of file diff --git a/main/boards/freenove-esp32s3-display-2.8-lcd/freenove-esp32s3-display-2.8-lcd.cc b/main/boards/freenove-esp32s3-display-2.8-lcd/freenove-esp32s3-display-2.8-lcd.cc new file mode 100644 index 0000000..48b0746 --- /dev/null +++ b/main/boards/freenove-esp32s3-display-2.8-lcd/freenove-esp32s3-display-2.8-lcd.cc @@ -0,0 +1,140 @@ +#include +#include +#include + +#include +#include "wifi_board.h" +#include "codecs/es8311_audio_codec.h" +#include "display/lcd_display.h" +#include "application.h" +#include "button.h" +#include "config.h" +#include "mcp_server.h" + +#include +#include +#include + +#include "led/single_led.h" +#include "system_reset.h" +#include "esp_lcd_ili9341.h" + +#define TAG "FreenoveESP32S3Display" + +class FreenoveESP32S3Display : public WifiBoard { + private: + Button boot_button_; + LcdDisplay *display_; + i2c_master_bus_handle_t codec_i2c_bus_; + + void InitializeI2c() { + i2c_master_bus_config_t i2c_bus_cfg = { + .i2c_port = AUDIO_CODEC_I2C_NUM, + .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_)); + } + + void InitializeSpi() { + spi_bus_config_t buscfg = {}; + buscfg.mosi_io_num = DISPLAY_MOSI_PIN; + buscfg.miso_io_num = DISPLAY_MIS0_PIN; + buscfg.sclk_io_num = DISPLAY_SCK_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(LCD_SPI_HOST, &buscfg, SPI_DMA_CH_AUTO)); + } + + void InitializeButtons() { + boot_button_.OnClick([this]() { + auto &app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting) { + EnterWifiConfigMode(); + } + app.ToggleChatState(); + }); + } + + + void InitializeLcdDisplay() { + 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(LCD_SPI_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_PIN; + panel_config.rgb_ele_order = DISPLAY_RGB_ORDER; + panel_config.bits_per_pixel = 16; + ESP_ERROR_CHECK(esp_lcd_new_panel_ili9341(panel_io, &panel_config, &panel)); + ESP_LOGI(TAG, "Install LCD driver ILI9341"); + 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 InitializeTools() { + } + + + public: + FreenoveESP32S3Display(): boot_button_(BOOT_BUTTON_GPIO) + { + InitializeI2c(); + InitializeSpi(); + InitializeLcdDisplay(); + InitializeButtons(); + InitializeTools(); + GetBacklight()->SetBrightness(100); + } + + virtual Led *GetLed() override { + static SingleLed led(BUILTIN_LED_GPIO); + return &led; + } + + virtual AudioCodec* GetAudioCodec() override { + static Es8311AudioCodec audio_codec(codec_i2c_bus_, AUDIO_CODEC_I2C_NUM, + 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, true, 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; + } + +}; + +DECLARE_BOARD(FreenoveESP32S3Display); \ No newline at end of file