devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

fix compiling errors (#1161)

Browse Source
This commit is contained in:
Xiaoxia
2025-09-04 15:17:32 +08:00
committed by GitHub
parent 5d3f597137
commit fc355605f5
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/Kconfig.projbuild
View File

@@ -428,24 +428,24 @@ endchoice
choice DISPLAY_ESP32S3_KORVO2_V3 choice DISPLAY_ESP32S3_KORVO2_V3
depends on BOARD_TYPE_ESP32S3_KORVO2_V3 depends on BOARD_TYPE_ESP32S3_KORVO2_V3
prompt "ESP32S3_KORVO2_V3 LCD Type" prompt "ESP32S3_KORVO2_V3 LCD Type"
default LCD_ST7789 default ESP32S3_KORVO2_V3_LCD_ST7789
help help
屏幕类型选择 屏幕类型选择
config LCD_ST7789 config ESP32S3_KORVO2_V3_LCD_ST7789
bool "ST7789, 分辨率240*280" bool "ST7789, 分辨率240*280"
config LCD_ILI9341 config ESP32S3_KORVO2_V3_LCD_ILI9341
bool "ILI9341, 分辨率240*320" bool "ILI9341, 分辨率240*320"
endchoice endchoice
choice DISPLAY_ESP32S3_AUDIO_BOARD choice DISPLAY_ESP32S3_AUDIO_BOARD
depends on BOARD_TYPE_ESP32S3_AUDIO_BOARD depends on BOARD_TYPE_ESP32S3_AUDIO_BOARD
prompt "ESP32S3_AUDIO_BOARD LCD Type" prompt "ESP32S3_AUDIO_BOARD LCD Type"
default LCD_JD9853 default AUDIO_BOARD_LCD_JD9853
help help
屏幕类型选择 屏幕类型选择
config LCD_JD9853 config AUDIO_BOARD_LCD_JD9853
bool "JD9853, 分辨率320*172" bool "JD9853, 分辨率320*172"
config LCD_ST7789 config AUDIO_BOARD_LCD_ST7789
bool "ST7789, 分辨率240*320" bool "ST7789, 分辨率240*320"
endchoice endchoice

4
main/boards/esp32s3-korvo2-v3/config.h
View File

@@ -26,7 +26,7 @@
#define VOLUME_UP_BUTTON_GPIO GPIO_NUM_NC #define VOLUME_UP_BUTTON_GPIO GPIO_NUM_NC
#define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_NC #define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_NC
#ifdef CONFIG_LCD_ST7789 #ifdef CONFIG_ESP32S3_KORVO2_V3_LCD_ST7789
#define DISPLAY_SDA_PIN GPIO_NUM_NC #define DISPLAY_SDA_PIN GPIO_NUM_NC
#define DISPLAY_SCL_PIN GPIO_NUM_NC #define DISPLAY_SCL_PIN GPIO_NUM_NC
#define DISPLAY_WIDTH 280 #define DISPLAY_WIDTH 280
@@ -40,7 +40,7 @@
#define DISPLAY_OFFSET_Y 0 #define DISPLAY_OFFSET_Y 0
#endif #endif
#ifdef CONFIG_LCD_ILI9341 #ifdef CONFIG_ESP32S3_KORVO2_V3_LCD_ILI9341
#define LCD_TYPE_ILI9341_SERIAL #define LCD_TYPE_ILI9341_SERIAL
#define DISPLAY_SDA_PIN GPIO_NUM_NC #define DISPLAY_SDA_PIN GPIO_NUM_NC
#define DISPLAY_SCL_PIN GPIO_NUM_NC #define DISPLAY_SCL_PIN GPIO_NUM_NC

4
main/boards/waveshare-s3-audio-board/config.h
View File

@@ -62,7 +62,7 @@
#ifdef CONFIG_LCD_JD9853 #ifdef CONFIG_AUDIO_BOARD_LCD_JD9853
#define LCD_TYPE_JD9853_SERIAL #define LCD_TYPE_JD9853_SERIAL
#define DISPLAY_WIDTH 320 #define DISPLAY_WIDTH 320
#define DISPLAY_HEIGHT 172 #define DISPLAY_HEIGHT 172
@@ -76,7 +76,7 @@
#define DISPLAY_OFFSET_Y 0 #define DISPLAY_OFFSET_Y 0
#endif #endif
#ifdef CONFIG_LCD_ST7789 #ifdef CONFIG_AUDIO_BOARD_LCD_ST7789
#define LCD_TYPE_ST7789_SERIAL #define LCD_TYPE_ST7789_SERIAL
#define DISPLAY_WIDTH 240 #define DISPLAY_WIDTH 240
#define DISPLAY_HEIGHT 320 #define DISPLAY_HEIGHT 320

3
main/display/lcd_display.cc
View File

@@ -636,9 +636,6 @@ void LcdDisplay::SetPreviewImage(const lv_img_dsc_t* img_dsc) {
// Create the image object inside the bubble // Create the image object inside the bubble
lv_obj_t* preview_image = lv_image_create(img_bubble); lv_obj_t* preview_image = lv_image_create(img_bubble);
// Create the image object inside the bubble
lv_obj_t* preview_image = lv_image_create(img_bubble);
// Copy the image descriptor and data to avoid source data changes // Copy the image descriptor and data to avoid source data changes
lv_img_dsc_t* copied_img_dsc = (lv_img_dsc_t*)heap_caps_malloc(sizeof(lv_img_dsc_t), MALLOC_CAP_8BIT); lv_img_dsc_t* copied_img_dsc = (lv_img_dsc_t*)heap_caps_malloc(sizeof(lv_img_dsc_t), MALLOC_CAP_8BIT);
if (copied_img_dsc == nullptr) { if (copied_img_dsc == nullptr) {