fix：根据要求重新优化代码

Author: DrayxR3X

.github/workflows/upload_component.yml

@@ -38,6 +38,7 @@ jobs:
             bsp/esp32_s3_touch_lcd_4_3c;
             bsp/esp32_s3_touch_lcd_2_8d;
             bsp/esp32_s3_touch_lcd_1_83;
+            bsp/esp32_s3_touch_amoled_1_32;
             bsp/esp32_c6_touch_amoled_2_06;
             sensor/qmi8658;
             sensor/pcf85063a;

bsp/esp32_s3_touch_amoled_1_32/Kconfig

@@ -50,68 +50,18 @@ menu "Board Support Package"
             default 2
             help
                 Supported max files for SPIFFS in the Virtual File System.
-    endmenu
-
-    menu "uSD card - Virtual File System"
-        config BSP_SD_FORMAT_ON_MOUNT_FAIL
-            bool "Format uSD card if mounting fails"
-            default n
-            help
-                The SDMMC host will format (FAT) the uSD card if it fails to mount the filesystem.
-
-        config BSP_SD_MOUNT_POINT
-            string "uSD card mount point"
-            default "/sdcard"
-            help
-                Mount point of the uSD card in the Virtual File System
 
     endmenu
-    menu "Display"
-        config BSP_LCD_RGB_BOUNCE_BUFFER_HEIGHT
-            int "RGB Bounce buffer height"
-            default 20
-            help
-                Height of bounce buffer. The width of the buffer is the same as that of the LCD.
-        config BSP_LCD_RGB_BUFFER_NUMS
-            int "Set number of frame buffers"
-            default 1
-            range 1 3
-            help
-                Let DPI LCD driver create a specified number of frame-size buffers. Only when it is set to multiple can the avoiding tearing be turned on.
-
-        config BSP_DISPLAY_LVGL_AVOID_TEAR
-            bool "Avoid tearing effect"
-            depends on BSP_LCD_RGB_BUFFER_NUMS > 1
-            default "n"
-            help
-                Avoid tearing effect through LVGL buffer mode and double frame buffers of RGB LCD. This feature is only available for RGB LCD.
-
-        choice BSP_DISPLAY_LVGL_MODE
-            depends on BSP_DISPLAY_LVGL_AVOID_TEAR
-            prompt "Select LVGL buffer mode"
-            default BSP_DISPLAY_LVGL_FULL_REFRESH
-            config BSP_DISPLAY_LVGL_FULL_REFRESH
-                bool "Full refresh"
-            config BSP_DISPLAY_LVGL_DIRECT_MODE
-                bool "Direct mode"
-        endchoice
-
-        config BSP_DISPLAY_BRIGHTNESS_LEDC_CH
-            int "LEDC channel index"
-            default 1
-            range 0 7
-            help
-                LEDC channel is used to generate PWM signal that controls display brightness.
-                Set LEDC index that should be used.
 
+    menu "Display"
         config BSP_DISPLAY_LVGL_BUF_HEIGHT
-            depends on !BSP_DISPLAY_LVGL_AVOID_TEAR
             int "LVGL buffer height"
             default 100
             help
                 Height of LVGL buffer. The width of the buffer is the same as that of the LCD.
+    
     endmenu
-
+    
     config BSP_I2S_NUM
         int "I2S peripheral index"
         default 1

bsp/esp32_s3_touch_amoled_1_32/README.md

@@ -4,6 +4,6 @@
 
 The ESP32-S3-Touch-AMOLED-1.32 is a 1.32-inch 466×466 capacitive touch development board designed by waveshare electronics.
 
-|                           HW version                            | BSP Version |
-|:---------------------------------------------------------------:| :---------: |
+|                           HW version                             | BSP Version |
+|:---------------------------------------------------------------: | :---------: |
 | [V1.0](http://www.waveshare.com/wiki/ESP32-S3-Touch-AMOLED-1.32) |      ^1     |

bsp/esp32_s3_touch_amoled_1_32/esp32_s3_touch_amoled_1_32.c

@@ -440,11 +440,7 @@ static lv_display_t *bsp_display_lcd_init()
     BSP_ERROR_CHECK_RETURN_NULL(bsp_display_new(&disp_config, &panel_handle, &io_handle));
 
     int buffer_size = 0;
-#if CONFIG_BSP_DISPLAY_LVGL_AVOID_TEAR
-    buffer_size = BSP_LCD_H_RES * BSP_LCD_V_RES;
-#else
     buffer_size = BSP_LCD_H_RES * LVGL_BUFFER_HEIGHT;
-#endif /* CONFIG_BSP_DISPLAY_LVGL_AVOID_TEAR */
 
     const lvgl_port_display_cfg_t disp_cfg = {
         .io_handle = io_handle,
@@ -457,7 +453,6 @@ static lv_display_t *bsp_display_lcd_init()
 #if LVGL_VERSION_MAJOR >= 9
         .color_format = LV_COLOR_FORMAT_RGB565,
 #endif
-
         .rotation = {
             .swap_xy = false,
             .mirror_x = false,
@@ -466,21 +461,10 @@ static lv_display_t *bsp_display_lcd_init()
         .flags = {
             .sw_rotate = true,
             .buff_dma = false,
-#if CONFIG_BSP_DISPLAY_LVGL_PSRAM
-            .buff_spiram = false,
-#endif
-#if CONFIG_BSP_DISPLAY_LVGL_FULL_REFRESH
-            .full_refresh = 1,
-#elif CONFIG_BSP_DISPLAY_LVGL_DIRECT_MODE
-            .direct_mode = 1,
-#endif
 #if LVGL_VERSION_MAJOR >= 9
             .swap_bytes = true,
 #endif
         }};
-#if CONFIG_BSP_LCD_RGB_BOUNCE_BUFFER_MODE
-    ESP_LOGW(TAG, "CONFIG_BSP_LCD_RGB_BOUNCE_BUFFER_MODE");
-#endif
     lv_display_t *disp = lvgl_port_add_disp(&disp_cfg);
     if (!disp)
     {
@@ -522,12 +506,7 @@ lv_display_t *bsp_display_start(void)
 {
     bsp_display_cfg_t cfg = {
         .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(),
-        .buffer_size = BSP_LCD_DRAW_BUFF_SIZE,
-        .double_buffer = BSP_LCD_DRAW_BUFF_DOUBLE,
-        .flags = {
-            .buff_dma = false,
-            .buff_spiram = true,
-        }};
+    };
     return bsp_display_start_with_config(&cfg);
 }
 

bsp/esp32_s3_touch_amoled_1_32/include/bsp/esp32_s3_touch_amoled_1_32.h

@@ -24,6 +24,8 @@
 #define BSP_CAPS_AUDIO          1
 #define BSP_CAPS_AUDIO_SPEAKER  1
 #define BSP_CAPS_AUDIO_MIC      1
+#define BSP_CAPS_SDCARD         0
+#define BSP_CAPS_IMU            0
 
 /**************************************************************************************************
  * ESP-SparkBot-BSP pinout
@@ -184,19 +186,6 @@ esp_err_t bsp_spiffs_mount(void);
  */
 esp_err_t bsp_spiffs_unmount(void);
 
-/**************************************************************************************************
- *
- * uSD card
- *
- * After mounting the uSD card, it can be accessed with stdio functions ie.:
- * \code{.c}
- * FILE* f = fopen(BSP_MOUNT_POINT"/hello.txt", "w");
- * fprintf(f, "Hello %s!\n", bsp_sdcard->cid.name);
- * fclose(f);
- * \endcode
- **************************************************************************************************/
-#define BSP_SD_MOUNT_POINT      CONFIG_BSP_SD_MOUNT_POINT
-
 /**************************************************************************************************
  *
  * LCD interface