fix compiling errors (#1161)

Author: 78

main/Kconfig.projbuild

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

main/boards/esp32s3-korvo2-v3/config.h

@@ -26,7 +26,7 @@
 #define VOLUME_UP_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_SCL_PIN GPIO_NUM_NC
 #define DISPLAY_WIDTH   280
@@ -40,7 +40,7 @@
 #define DISPLAY_OFFSET_Y  0
 #endif
 
-#ifdef CONFIG_LCD_ILI9341
+#ifdef CONFIG_ESP32S3_KORVO2_V3_LCD_ILI9341
 #define LCD_TYPE_ILI9341_SERIAL
 #define DISPLAY_SDA_PIN GPIO_NUM_NC
 #define DISPLAY_SCL_PIN GPIO_NUM_NC
@@ -78,4 +78,4 @@
 #define CAMERA_PIN_PCLK 11
 
 #define XCLK_FREQ_HZ 20000000
-#endif // _BOARD_CONFIG_H_
+#endif // _BOARD_CONFIG_H_

main/boards/waveshare-s3-audio-board/config.h

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

main/display/lcd_display.cc

@@ -636,9 +636,6 @@ void LcdDisplay::SetPreviewImage(const lv_img_dsc_t* img_dsc) {
         // Create the image object inside the 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
         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) {