Add imac targets to CI + fix ESP IDF 4.4.x builds for imac target (#450)

This commit is contained in:
ivmarkov 2024-07-07 18:33:28 +03:00 committed by GitHub
parent 74ffea5c0c
commit d1ace4b79a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 2 deletions

View File

@ -22,6 +22,7 @@ jobs:
matrix:
target:
- riscv32imc-esp-espidf
- riscv32imac-esp-espidf
- xtensa-esp32-espidf
- xtensa-esp32s2-espidf
- xtensa-esp32s3-espidf
@ -87,6 +88,7 @@ jobs:
chmod a+x $HOME/.cargo/bin/ldproxy
- name: Build | Examples
if: matrix.target != 'riscv32imac-esp-espidf'
env:
ESP_IDF_VERSION: ${{ matrix.idf-version }}
ESP_IDF_SDKCONFIG_DEFAULTS: "${{ github.workspace }}/.github/configs/sdkconfig.defaults"

View File

@ -1448,7 +1448,7 @@ fn gpio_reset_without_pull(pin: gpio_num_t) -> Result<(), EspError> {
pull_up_en: esp_idf_sys::gpio_pullup_t_GPIO_PULLUP_DISABLE,
pull_down_en: esp_idf_sys::gpio_pulldown_t_GPIO_PULLDOWN_DISABLE,
intr_type: esp_idf_sys::gpio_int_type_t_GPIO_INTR_DISABLE,
#[cfg(esp32h2)]
#[cfg(all(esp32h2, not(esp_idf_version_major = "4")))]
hys_ctrl_mode: esp_idf_sys::gpio_hys_ctrl_mode_t_GPIO_HYS_SOFT_DISABLE,
};

View File

@ -146,7 +146,7 @@ impl<'d> TimerDriver<'d> {
},
intr_type: timer_intr_mode_t_TIMER_INTR_LEVEL,
divider: config.divider,
#[cfg(all(any(esp32s2, esp32s3, esp32c3), esp_idf_version_major = "4"))]
#[cfg(all(not(esp32), esp_idf_version_major = "4"))]
clk_src: if config.xtal {
timer_src_clk_t_TIMER_SRC_CLK_XTAL
} else {