diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 90fc5dc2b4..5ecd283102 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,11 +11,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - idf_ver: ["release-v4.4", "release-v5.0", "release-v5.1", "release-v5.2", "latest"] + idf_ver: ["release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "latest"] idf_target: ["esp32", "esp32s2", "esp32s3", "esp32c2", "esp32c3"] - exclude: - - idf_ver: "release-v4.4" - idf_target: esp32c2 # ESP32C2 support started with version 5.0 container: espressif/idf:${{ matrix.idf_ver }} steps: - uses: actions/checkout@v1 diff --git a/target/esp32s3/ll_cam.c b/target/esp32s3/ll_cam.c index c61846999e..71caf14f69 100644 --- a/target/esp32s3/ll_cam.c +++ b/target/esp32s3/ll_cam.c @@ -202,7 +202,11 @@ static esp_err_t ll_cam_dma_init(cam_obj_t *cam) gdma_channel_alloc_config_t rx_alloc_config = { .direction = GDMA_CHANNEL_DIRECTION_RX, }; +#if ((ESP_IDF_VERSION_MAJOR == 5 && ESP_IDF_VERSION_MINOR >= 4) || ESP_IDF_VERSION_MAJOR > 5) + esp_err_t ret = gdma_new_ahb_channel(&rx_alloc_config, &cam->dma_channel_handle); +#else esp_err_t ret = gdma_new_channel(&rx_alloc_config, &cam->dma_channel_handle); +#endif if (ret != ESP_OK) { cam_deinit(); ESP_LOGE(TAG, "Can't find available GDMA channel");