Merge pull request #394 from leeebo/master

fix(bsp): fix idf5.0 adc build with unknown type error
espressif · Sep 26, 2024 · be509a7 · be509a7
2 parents 064e0e4 + 18ea208
commit be509a7
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 5 deletions.
diff --git a/bsp/esp32_s3_korvo_1/CHANGELOG.md b/bsp/esp32_s3_korvo_1/CHANGELOG.md
@@ -0,0 +1,7 @@
+# ChangeLog
+
+## v1.1.1 - 2024-09-20
+
+### Bugfix
+
+* Fix adc build error when using `ESP-IDF` `5.0`
diff --git a/bsp/esp32_s3_korvo_1/esp32_s3_korvo_1_idf5.c b/bsp/esp32_s3_korvo_1/esp32_s3_korvo_1_idf5.c
@@ -5,6 +5,7 @@
  */
 
 #include "esp_err.h"
+#include "esp_adc/adc_cali_scheme.h"
 #include "esp_adc/adc_oneshot.h"
 #include "bsp/esp32_s3_korvo_1.h"
 #include "bsp_err_check.h"

diff --git a/bsp/esp32_s3_korvo_1/idf_component.yml b/bsp/esp32_s3_korvo_1/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.1.0"
+version: "1.1.1"
 description: Board Support Package (BSP) for ESP32-S3-KORVO-1
 url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_korvo_1
 

diff --git a/bsp/esp32_s3_korvo_2/CHANGELOG.md b/bsp/esp32_s3_korvo_2/CHANGELOG.md
@@ -0,0 +1,7 @@
+# ChangeLog
+
+## v2.2.1 - 2024-09-20
+
+### Bugfix
+
+* Fix adc build error when using `ESP-IDF` `5.0`
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
@@ -5,6 +5,7 @@
  */
 
 #include "esp_err.h"
+#include "esp_adc/adc_cali_scheme.h"
 #include "esp_adc/adc_oneshot.h"
 #include "bsp/esp32_s3_korvo_2.h"
 #include "bsp_err_check.h"

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: "2.2.0~1"
+version: "2.2.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_lcd_ev_board/CHANGELOG.md b/bsp/esp32_s3_lcd_ev_board/CHANGELOG.md
@@ -32,7 +32,7 @@
     * Add new APIs for spiffs, audio in `bsp/esp32_s3_lcd_ev_board.h`
     * Add new APIs for ADC in `bsp/esp32_s3_lcd_ev_board.h`
 
-## v3.0.0 - 2023-12-02
+## v2.1.0 - 2023-12-02
 
 ### Bugfix
 
@@ -52,3 +52,9 @@
 * Update the version of `ESP-IDF` to `>5.0.1`
 * Use `esp_lcd_gc9503` version `^1` when using `ESP-IDF` version `<5.1.2`
 * Use `esp_lcd_gc9503` version `^3` when using `ESP-IDF` version `>=5.1.2`
+
+## v2.2.2 - 2024-09-20
+
+### Bugfix
+
+* Fix adc build error when using `ESP-IDF` `5.0`
diff --git a/bsp/esp32_s3_lcd_ev_board/idf_component.yml b/bsp/esp32_s3_lcd_ev_board/idf_component.yml
@@ -1,4 +1,4 @@
-version: "2.2.1~1"
+version: "2.2.2"
 description: Board Support Package (BSP) for ESP32-S3-LCD-EV-Board
 url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_lcd_ev_board
 

diff --git a/bsp/esp32_s3_lcd_ev_board/include/bsp/esp32_s3_lcd_ev_board.h b/bsp/esp32_s3_lcd_ev_board/include/bsp/esp32_s3_lcd_ev_board.h
@@ -14,6 +14,7 @@
 #include "driver/i2s_std.h"
 #include "driver/gpio.h"
 #include "soc/usb_pins.h"
+#include "esp_adc/adc_cali_scheme.h"
 #include "esp_adc/adc_oneshot.h"
 #include "esp_codec_dev.h"
 #include "esp_err.h"

diff --git a/bsp/esp32_s3_usb_otg/CHANGELOG.md b/bsp/esp32_s3_usb_otg/CHANGELOG.md
@@ -0,0 +1,7 @@
+# ChangeLog
+
+## v1.6.1 - 2024-09-20
+
+### Bugfix
+
+* Fix adc build error when using `ESP-IDF` `5.0`
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
@@ -5,6 +5,7 @@
  */
 
 #include "esp_err.h"
+#include "esp_adc/adc_cali_scheme.h"
 #include "esp_adc/adc_oneshot.h"
 #include "bsp/esp32_s3_usb_otg.h"
 #include "bsp_err_check.h"

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: "1.6.0"
+version: "1.6.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