Merge pull request #586 from espressif/fix/adc_benchmark

espzav · web-flow · commit d0e3b0775e43 · 2025-06-25T07:30:29.000+02:00
Fix adc and benchmark
diff --git a/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c b/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c
@@ -126,14 +126,14 @@ esp_err_t bsp_voltage_init(void)
     /* Init ADC1 channels */
     const adc_oneshot_chan_cfg_t config = {
         .bitwidth = ADC_BITWIDTH_DEFAULT,
-        .atten = ADC_ATTEN_DB_11,
+        .atten = ADC_ATTEN_DB_12,
     };
     BSP_ERROR_CHECK_RETURN_ERR(adc_oneshot_config_channel(bsp_adc_handle, ADC_CHANNEL_5, &config));
 
     /* ESP32-S3 supports Curve Fitting calibration scheme */
     const adc_cali_curve_fitting_config_t cali_config = {
         .unit_id = ADC_UNIT_1,
-        .atten = ADC_ATTEN_DB_11,
+        .atten = ADC_ATTEN_DB_12,
         .bitwidth = ADC_BITWIDTH_DEFAULT,
     };
     BSP_ERROR_CHECK_RETURN_ERR(adc_cali_create_scheme_curve_fitting(&cali_config, &bsp_adc_cali_handle));
diff --git a/bsp/esp32_s3_korvo_2/idf_component.yml b/bsp/esp32_s3_korvo_2/idf_component.yml
@@ -1,4 +1,4 @@
-version: "4.0.0~1"
+version: "4.0.1"
 description: Board Support Package (BSP) for ESP32-S3-Korvo-2
 url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_korvo_2
 
diff --git a/bsp/esp32_s3_usb_otg/CMakeLists.txt b/bsp/esp32_s3_usb_otg/CMakeLists.txt
@@ -1,16 +1,7 @@
-#IDF version is less than IDF5.0
-if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_LESS "5.0")
-    set(SRC_VER "esp32_s3_usb_otg_idf4.c")
-    set(REQ "")
-else()
-    set(SRC_VER "esp32_s3_usb_otg_idf5.c")
-    set(REQ esp_adc)
-endif()
-
 idf_component_register(
-    SRCS "esp32_s3_usb_otg.c" ${SRC_VER}
+    SRCS "esp32_s3_usb_otg.c" "esp32_s3_usb_otg_idf5.c"
     INCLUDE_DIRS "include"
     PRIV_INCLUDE_DIRS "priv_include"
     REQUIRES driver esp_lcd fatfs
-    PRIV_REQUIRES usb spiffs ${REQ}
+    PRIV_REQUIRES usb spiffs esp_adc
 )
diff --git a/bsp/esp32_s3_usb_otg/README.md b/bsp/esp32_s3_usb_otg/README.md
@@ -33,17 +33,17 @@ ESP32-S3-USB-OTG is a development board that focuses on USB-OTG function verific
 
 |     Available    |       Capability       |Controller/Codec|                                           Component                                          |Version|
 |------------------|------------------------|----------------|----------------------------------------------------------------------------------------------|-------|
-|:heavy_check_mark:|     :pager: DISPLAY    |     st7789     |                                              idf                                             | >=4.4 |
+|:heavy_check_mark:|     :pager: DISPLAY    |     st7789     |                                              idf                                             |>=5.1.3|
 |:heavy_check_mark:|:black_circle: LVGL_PORT|                |[espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port)|   ^2  |
 |        :x:       |    :point_up: TOUCH    |                |                                                                                              |       |
 |:heavy_check_mark:| :radio_button: BUTTONS |                |       [espressif/button](https://components.espressif.com/components/espressif/button)       |   ^4  |
 |        :x:       |  :musical_note: AUDIO  |                |                                                                                              |       |
 |        :x:       | :speaker: AUDIO_SPEAKER|                |                                                                                              |       |
 |        :x:       | :microphone: AUDIO_MIC |                |                                                                                              |       |
-|:heavy_check_mark:|  :floppy_disk: SDCARD  |                |                                              idf                                             | >=4.4 |
+|:heavy_check_mark:|  :floppy_disk: SDCARD  |                |                                              idf                                             |>=5.1.3|
 |        :x:       |    :video_game: IMU    |                |                                                                                              |       |
-|:heavy_check_mark:|       :bulb: LED       |                |                                              idf                                             | >=4.4 |
-|:heavy_check_mark:|      :battery: BAT     |                |                                              idf                                             | >=4.4 |
+|:heavy_check_mark:|       :bulb: LED       |                |                                              idf                                             |>=5.1.3|
+|:heavy_check_mark:|      :battery: BAT     |                |                                              idf                                             |>=5.1.3|
 
 <!-- END_DEPENDENCIES -->
 </div>
diff --git a/bsp/esp32_s3_usb_otg/esp32_s3_usb_otg_idf4.c b/bsp/esp32_s3_usb_otg/esp32_s3_usb_otg_idf4.c
diff --git a/bsp/esp32_s3_usb_otg/esp32_s3_usb_otg_idf5.c b/bsp/esp32_s3_usb_otg/esp32_s3_usb_otg_idf5.c
@@ -43,15 +43,15 @@ esp_err_t bsp_voltage_init(void)
     /* Init ADC1 channels */
     const adc_oneshot_chan_cfg_t config = {
         .bitwidth = ADC_BITWIDTH_DEFAULT,
-        .atten = ADC_ATTEN_DB_11,
+        .atten = ADC_ATTEN_DB_12,
     };
     BSP_ERROR_CHECK_RETURN_ERR(adc_oneshot_config_channel(bsp_adc_handle, ADC_CHANNEL_0, &config));
     BSP_ERROR_CHECK_RETURN_ERR(adc_oneshot_config_channel(bsp_adc_handle, ADC_CHANNEL_5, &config));
 
     /* ESP32-S3 supports Curve Fitting calibration scheme */
     const adc_cali_curve_fitting_config_t cali_config = {
         .unit_id = ADC_UNIT_1,
-        .atten = ADC_ATTEN_DB_11,
+        .atten = ADC_ATTEN_DB_12,
         .bitwidth = ADC_BITWIDTH_DEFAULT,
     };
     BSP_ERROR_CHECK_RETURN_ERR(adc_cali_create_scheme_curve_fitting(&cali_config, &bsp_adc_cali_handle));
diff --git a/bsp/esp32_s3_usb_otg/idf_component.yml b/bsp/esp32_s3_usb_otg/idf_component.yml
@@ -1,4 +1,4 @@
-version: "2.0.0~1"
+version: "2.0.1"
 description: Board Support Package (BSP) for ESP32-S3-USB-OTG
 url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_usb_otg
 
@@ -9,7 +9,7 @@ tags:
   - bsp
 
 dependencies:
-  idf: ">=4.4"
+  idf: ">=5.1.3"
 
   button:
     version: "^4"
diff --git a/examples/display_lvgl_benchmark/main/main.c b/examples/display_lvgl_benchmark/main/main.c
@@ -24,13 +24,37 @@ static char *TAG = "app_main";
 void app_main(void)
 {
     /* Initialize display and LVGL */
-#if defined(BSP_LCD_SUB_BOARD_2_H_RES)
+
+#if defined(BSP_BOARD_ESP32_S3_LCD_EV_BOARD)
     /* Only for esp32_s3_lcd_ev_board */
     bsp_display_cfg_t cfg = {
         .lvgl_port_cfg = ESP_LVGL_PORT_INIT_CONFIG(),
     };
     cfg.lvgl_port_cfg.task_stack = 10000;
     bsp_display_start_with_config(&cfg);
+#elif defined(BSP_BOARD_ESP32_S3_EYE)
+    /* Only for esp32_s3_eye */
+    bsp_display_cfg_t cfg = {
+        .lvgl_port_cfg = {
+            .task_priority = CONFIG_BSP_DISPLAY_LVGL_TASK_PRIORITY,
+            .task_stack = 10000,
+            .task_affinity = 1,
+            .timer_period_ms = CONFIG_BSP_DISPLAY_LVGL_TICK,
+            .task_max_sleep_ms = CONFIG_BSP_DISPLAY_LVGL_MAX_SLEEP,
+        },
+        .buffer_size = BSP_LCD_DRAW_BUFF_SIZE,
+        .double_buffer = BSP_LCD_DRAW_BUFF_DOUBLE,
+        .flags = {
+#if (CONFIG_BSP_DISPLAY_LVGL_BUFFER_IN_PSRAM && CONFIG_SPIRAM)
+            .buff_dma = false,
+            .buff_spiram = true,
+#else
+            .buff_dma = true,
+            .buff_spiram = false,
+#endif
+        }
+    };
+    bsp_display_start_with_config(&cfg);
 #else
     bsp_display_start();
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: "4.0.0~1"`
	`1`	`+version: "4.0.1"`
`2`	`2`	`description: Board Support Package (BSP) for ESP32-S3-Korvo-2`
`3`	`3`	`url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_korvo_2`
`4`	`4`