Skip to content

Commit c8a96e3

Browse files
authored
Fix deprecation in IDF 5.4+ and update IDF build versions (#681)
IDF v5.3 added and EOL IDF v4.4 removed
1 parent 8e1ec63 commit c8a96e3

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
idf_ver: ["release-v4.4", "release-v5.0", "release-v5.1", "release-v5.2", "latest"]
14+
idf_ver: ["release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "latest"]
1515
idf_target: ["esp32", "esp32s2", "esp32s3", "esp32c2", "esp32c3"]
16-
exclude:
17-
- idf_ver: "release-v4.4"
18-
idf_target: esp32c2 # ESP32C2 support started with version 5.0
1916
container: espressif/idf:${{ matrix.idf_ver }}
2017
steps:
2118
- uses: actions/checkout@v1

target/esp32s3/ll_cam.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,11 @@ static esp_err_t ll_cam_dma_init(cam_obj_t *cam)
202202
gdma_channel_alloc_config_t rx_alloc_config = {
203203
.direction = GDMA_CHANNEL_DIRECTION_RX,
204204
};
205+
#if ((ESP_IDF_VERSION_MAJOR == 5 && ESP_IDF_VERSION_MINOR >= 4) || ESP_IDF_VERSION_MAJOR > 5)
206+
esp_err_t ret = gdma_new_ahb_channel(&rx_alloc_config, &cam->dma_channel_handle);
207+
#else
205208
esp_err_t ret = gdma_new_channel(&rx_alloc_config, &cam->dma_channel_handle);
209+
#endif
206210
if (ret != ESP_OK) {
207211
cam_deinit();
208212
ESP_LOGE(TAG, "Can't find available GDMA channel");

0 commit comments

Comments
 (0)