Merge branch 'contrib/github_pr_18832_v6.1' into 'release/v6.1'

fix(mocks): add missing `esp_hal_*` includes (GitHub PR) (v6.1)

See merge request espressif/esp-idf!50726
This commit is contained in:
morris
2026-07-29 19:00:31 +08:00
2 changed files with 8 additions and 1 deletions

View File

@@ -16,6 +16,13 @@ set(include_dirs
"${original_driver_dir}/i2c/include"
"${IDF_PATH}/components/esp_driver_usb_serial_jtag/include")
list(APPEND include_dirs
"${IDF_PATH}/components/esp_hal_gpio/include"
"${IDF_PATH}/components/esp_hal_gpio/linux/include"
"${IDF_PATH}/components/esp_hal_gpspi/include"
"${IDF_PATH}/components/esp_hal_rmt/include"
"${IDF_PATH}/components/esp_hal_i2c/include")
# Note: "hal" and "soc" are only required for corresponding header files and their definitions
# here, they don't provide functionality when built for running on the host.
idf_component_mock(INCLUDE_DIRS ${include_dirs}

View File

@@ -150,7 +150,7 @@ void app_main(void)
bootloader_random_enable_Ignore();
bootloader_random_enable();
esp_flash_encryption_enabled_IgnoreAndReturn(true);
esp_efuse_is_flash_encryption_enabled_IgnoreAndReturn(true);
bool flash_encrypted = esp_efuse_is_flash_encryption_enabled();
(void)flash_encrypted;