Fix deprecation in IDF 5.4+ and update IDF build versions (#681)
IDF v5.3 added and EOL IDF v4.4 removed
This commit is contained in:
parent
8e1ec63c99
commit
c8a96e3570
2 changed files with 5 additions and 4 deletions
5
.github/workflows/build.yml
vendored
5
.github/workflows/build.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
Loading…
Reference in a new issue