添加微雪电子esp32-s3-touch-lcd-3.49系列的支持

main/CMakeLists.txt

@@ -254,6 +254,11 @@ elseif(CONFIG_BOARD_TYPE_ESP32S3_Touch_AMOLED_1_75)
     set(LVGL_TEXT_FONT ${FONT_PUHUI_BASIC_30_4})
     set(LVGL_ICON_FONT ${FONT_AWESOME_30_4})
     set(DEFAULT_ASSETS ${ASSETS_XIAOZHI_PUHUI_COMMON_30_4_EMOJI_64})
+elseif(CONFIG_BOARD_TYPE_ESP32S3_Touch_LCD_3_49)
+    set(BOARD_TYPE "waveshare-s3-touch-lcd-3.49")
+    set(LVGL_TEXT_FONT ${FONT_PUHUI_BASIC_30_4})
+    set(LVGL_ICON_FONT ${FONT_AWESOME_30_4})
+    set(DEFAULT_ASSETS ${ASSETS_XIAOZHI_PUHUI_COMMON_30_4_EMOJI_64})
 elseif(CONFIG_BOARD_TYPE_ESP32S3_Touch_LCD_1_85C)
     set(BOARD_TYPE "esp32-s3-touch-lcd-1.85c")
     set(LVGL_TEXT_FONT ${FONT_PUHUI_BASIC_16_4})

main/Kconfig.projbuild

@@ -222,6 +222,9 @@ choice BOARD_TYPE
     config BOARD_TYPE_ESP32C6_Touch_AMOLED_1_43
         bool "Waveshare ESP32-C6-Touch-AMOLOED-1.43"
         depends on IDF_TARGET_ESP32C6
+    config BOARD_TYPE_ESP32S3_Touch_LCD_3_49
+        bool "Waveshare ESP32-S3-Touch-LCD-3.49"
+        depends on IDF_TARGET_ESP32S3
     config BOARD_TYPE_ESP32S3_Touch_LCD_3_5
         bool "Waveshare ESP32-S3-Touch-LCD-3.5"
         depends on IDF_TARGET_ESP32S3
@@ -520,7 +523,7 @@ config USE_AUDIO_PROCESSOR
 config USE_DEVICE_AEC
     bool "Enable Device-Side AEC"
     default n
-        depends on USE_AUDIO_PROCESSOR && (BOARD_TYPE_ESP_BOX_3 || BOARD_TYPE_ESP_BOX || BOARD_TYPE_ESP_BOX_LITE || BOARD_TYPE_LICHUANG_DEV || BOARD_TYPE_ESP32S3_KORVO2_V3 || BOARD_TYPE_ESP32S3_Touch_AMOLED_1_75 || BOARD_TYPE_ESP32S3_Touch_AMOLED_2_06 || BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_4B || BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_XC || BOARD_TYPE_ESP_S3_LCD_EV_Board_2)
+        depends on USE_AUDIO_PROCESSOR && (BOARD_TYPE_ESP32S3_Touch_LCD_3_49 || BOARD_TYPE_ESP_BOX_3 || BOARD_TYPE_ESP_BOX || BOARD_TYPE_ESP_BOX_LITE || BOARD_TYPE_LICHUANG_DEV || BOARD_TYPE_ESP32S3_KORVO2_V3 || BOARD_TYPE_ESP32S3_Touch_AMOLED_1_75 || BOARD_TYPE_ESP32S3_Touch_AMOLED_2_06 || BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_4B || BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_XC || BOARD_TYPE_ESP_S3_LCD_EV_Board_2)
     help
         因为性能不够，不建议和微信聊天界面风格同时开启
 

main/boards/waveshare-s3-touch-lcd-3.49/README.md

@@ -0,0 +1,3 @@
+新增 微雪 开发板: ESP32-S3-Touch-LCD-3.49
+产品链接：
+https://www.waveshare.net/shop/ESP32-S3-Touch-LCD-3.49.htm

main/boards/waveshare-s3-touch-lcd-3.49/config.h

@@ -0,0 +1,62 @@
+#ifndef _BOARD_CONFIG_H_
+#define _BOARD_CONFIG_H_
+
+#include <driver/gpio.h>
+#include <driver/spi_master.h>
+#include "lvgl.h"
+
+#define AUDIO_INPUT_SAMPLE_RATE 24000
+#define AUDIO_OUTPUT_SAMPLE_RATE 24000
+
+#define AUDIO_INPUT_REFERENCE    true
+
+#define AUDIO_I2S_GPIO_MCLK  GPIO_NUM_7
+#define AUDIO_I2S_GPIO_WS    GPIO_NUM_46
+#define AUDIO_I2S_GPIO_BCLK  GPIO_NUM_15
+#define AUDIO_I2S_GPIO_DIN   GPIO_NUM_6
+#define AUDIO_I2S_GPIO_DOUT  GPIO_NUM_45
+
+#define AUDIO_CODEC_PA_PIN       GPIO_NUM_NC
+#define AUDIO_CODEC_I2C_SDA_PIN  GPIO_NUM_47
+#define AUDIO_CODEC_I2C_SCL_PIN  GPIO_NUM_48
+#define Dev_Touch_I2C_SDA_PIN    GPIO_NUM_17
+#define Dev_Touch_I2C_SCL_PIN    GPIO_NUM_18
+#define AUDIO_CODEC_ES8311_ADDR  ES8311_CODEC_DEFAULT_ADDR
+#define AUDIO_CODEC_ES7210_ADDR  ES7210_CODEC_DEFAULT_ADDR
+
+#define I2C_Touch_ADDRESS       0x3b
+#define I2C_Touch_SDA_PIN       GPIO_NUM_17
+#define I2C_Touch_SCL_PIN       GPIO_NUM_18
+
+#define BOOT_BUTTON_GPIO        GPIO_NUM_0
+#define PWR_BUTTON_GPIO         GPIO_NUM_16
+
+#define LCD_CS       GPIO_NUM_9
+#define LCD_PCLK     GPIO_NUM_10
+#define LCD_D0       GPIO_NUM_11
+#define LCD_D1       GPIO_NUM_12
+#define LCD_D2       GPIO_NUM_13
+#define LCD_D3       GPIO_NUM_14
+#define LCD_RST      GPIO_NUM_21
+#define LCD_LIGHT    (-1)
+
+#define DISPLAY_WIDTH  172
+#define DISPLAY_HEIGHT 640
+#define LVGL_DMA_BUFF_LEN (DISPLAY_WIDTH * 64 * 2)
+#define LVGL_SPIRAM_BUFF_LEN (DISPLAY_WIDTH * DISPLAY_HEIGHT * 2)
+
+#define DISPLAY_ROTATION_90 false
+
+#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_BACKLIGHT_PIN   GPIO_NUM_8
+#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true
+
+
+#endif // _BOARD_CONFIG_H_

main/boards/waveshare-s3-touch-lcd-3.49/config.json

@@ -0,0 +1,12 @@
+{
+    "target": "esp32s3",
+    "builds": [
+        {
+            "name": "waveshare-s3-touch-lcd-3.49",
+            "sdkconfig_append": [
+                "CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
+                "CONFIG_USE_DEVICE_AEC=y"
+            ]
+        }
+    ]
+}

main/boards/waveshare-s3-touch-lcd-3.49/custom_lcd_display.cc

@@ -0,0 +1,145 @@
+#include "custom_lcd_display.h"
+
+#include "lcd_display.h"
+
+#include <vector>
+#include <esp_log.h>
+#include <esp_err.h>
+#include <esp_lvgl_port.h>
+#include "assets/lang_config.h"
+#include <cstring>
+#include "settings.h"
+
+#include "esp_lcd_panel_io.h"
+
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/semphr.h"
+
+#include "config.h"
+
+#include "board.h"
+
+#define TAG "CustomLcdDisplay"
+
+static SemaphoreHandle_t trans_done_sem = NULL;
+static uint16_t *trans_buf_1;
+
+#if (DISPLAY_ROTATION_90 == true)
+static uint16_t *dest_map;
+#endif
+
+
+bool CustomLcdDisplay::lvgl_port_flush_io_ready_callback(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_io_event_data_t *edata, void *user_ctx) {
+    BaseType_t taskAwake = pdFALSE;
+    lv_display_t *disp_drv = (lv_display_t *)user_ctx;
+    assert(disp_drv != NULL);
+    if (trans_done_sem) {
+        xSemaphoreGiveFromISR(trans_done_sem, &taskAwake);
+    }
+    return false;
+}
+
+void CustomLcdDisplay::lvgl_port_flush_callback(lv_display_t *drv, const lv_area_t *area, uint8_t *color_map) {
+    assert(drv != NULL);
+    esp_lcd_panel_handle_t panel_handle = (esp_lcd_panel_handle_t)lv_display_get_user_data(drv);
+    assert(panel_handle != NULL);
+
+    lv_draw_sw_rgb565_swap(color_map, lv_area_get_width(area) * lv_area_get_height(area));
+
+#if (DISPLAY_ROTATION_90 == true)
+    lv_display_rotation_t rotation = lv_display_get_rotation(drv);
+    lv_area_t rotated_area;
+    if(rotation != LV_DISPLAY_ROTATION_0) {
+        lv_color_format_t cf = lv_display_get_color_format(drv);
+        /*Calculate the position of the rotated area*/
+        rotated_area = *area;
+        lv_display_rotate_area(drv, &rotated_area);
+        /*Calculate the source stride (bytes in a line) from the width of the area*/
+        uint32_t src_stride = lv_draw_buf_width_to_stride(lv_area_get_width(area), cf);
+        /*Calculate the stride of the destination (rotated) area too*/
+        uint32_t dest_stride = lv_draw_buf_width_to_stride(lv_area_get_width(&rotated_area), cf);
+        /*Have a buffer to store the rotated area and perform the rotation*/
+
+        int32_t src_w = lv_area_get_width(area);
+        int32_t src_h = lv_area_get_height(area);
+        lv_draw_sw_rotate(color_map, dest_map, src_w, src_h, src_stride, dest_stride, rotation, cf);
+        /*Use the rotated area and rotated buffer from now on*/
+        area = &rotated_area;
+    }
+#endif
+    const int flush_coun = (LVGL_SPIRAM_BUFF_LEN / LVGL_DMA_BUFF_LEN);
+    const int offgap = (DISPLAY_HEIGHT / flush_coun);
+    const int dmalen = (LVGL_DMA_BUFF_LEN / 2);
+    int offsetx1 = 0;
+    int offsety1 = 0;
+    int offsetx2 = DISPLAY_WIDTH;
+    int offsety2 = offgap;
+#if (DISPLAY_ROTATION_90 == true)
+    uint16_t *map = (uint16_t*)dest_map;
+#else
+    uint16_t *map = (uint16_t*)color_map;
+#endif
+    xSemaphoreGive(trans_done_sem);
+
+    for(int i = 0; i<flush_coun; i++) {
+        xSemaphoreTake(trans_done_sem,portMAX_DELAY);
+        memcpy(trans_buf_1,map,LVGL_DMA_BUFF_LEN);
+        esp_lcd_panel_draw_bitmap(panel_handle, offsetx1, offsety1, offsetx2, offsety2, trans_buf_1);
+        offsety1 += offgap;
+        offsety2 += offgap;
+        map += dmalen;
+    }
+    xSemaphoreTake(trans_done_sem,portMAX_DELAY);
+    lv_disp_flush_ready(drv);
+}
+
+
+CustomLcdDisplay::CustomLcdDisplay(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)
+    : LcdDisplay(panel_io, panel, width, height) {
+
+    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();
+    port_cfg.task_priority = 2;
+    port_cfg.timer_period_ms = 50;
+    lvgl_port_init(&port_cfg);
+    trans_done_sem = xSemaphoreCreateBinary();
+    trans_buf_1 = (uint16_t *)heap_caps_malloc(LVGL_DMA_BUFF_LEN, MALLOC_CAP_DMA);
+
+    uint32_t buffer_size = 0;
+    lv_color_t *buf1 = NULL;
+    lvgl_port_lock(0);
+    uint8_t color_bytes = lv_color_format_get_size(LV_COLOR_FORMAT_RGB565);
+    display_ = lv_display_create(width_, height_);
+    lv_display_set_flush_cb(display_, lvgl_port_flush_callback);
+    buffer_size = width_ * height_;
+    buf1 = (lv_color_t *)heap_caps_aligned_alloc(1, buffer_size * color_bytes, MALLOC_CAP_SPIRAM);
+#if (DISPLAY_ROTATION_90 == true)
+    dest_map = (uint16_t *)heap_caps_malloc(buffer_size * color_bytes, MALLOC_CAP_SPIRAM);
+    lv_display_set_rotation(display_, LV_DISPLAY_ROTATION_90);
+#endif
+    lv_display_set_buffers(display_, buf1, NULL, buffer_size * color_bytes, LV_DISPLAY_RENDER_MODE_FULL);
+    lv_display_set_user_data(display_, panel_);
+    lvgl_port_unlock();
+
+    esp_lcd_panel_io_callbacks_t cbs = {
+        .on_color_trans_done = lvgl_port_flush_io_ready_callback,
+    };
+    /* Register done callback */
+    esp_lcd_panel_io_register_event_callbacks(panel_io_, &cbs, display_);
+
+    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);
+    }
+    SetupUI();
+}

main/boards/waveshare-s3-touch-lcd-3.49/custom_lcd_display.h

@@ -0,0 +1,17 @@
+#ifndef __CUSTOM_LCD_DISPLAY_H__
+#define __CUSTOM_LCD_DISPLAY_H__
+
+#include "lcd_display.h"
+
+// // SPI LCD显示器
+class CustomLcdDisplay : public LcdDisplay {
+public:
+    CustomLcdDisplay(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);
+private:
+    static bool lvgl_port_flush_io_ready_callback(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_io_event_data_t *edata, void *user_ctx);
+    static void lvgl_port_flush_callback(lv_display_t *drv, const lv_area_t *area, uint8_t *color_map);
+};
+
+#endif // __CUSTOM_LCD_DISPLAY_H__