diff --git a/components/driver/test_apps/gpio/main/test_rtcio.c b/components/driver/test_apps/gpio/main/test_rtcio.c index 32666bba0e..c6bd60d815 100644 --- a/components/driver/test_apps/gpio/main/test_rtcio.c +++ b/components/driver/test_apps/gpio/main/test_rtcio.c @@ -341,7 +341,6 @@ TEST_CASE("RTCIO_output_hold_test", "[rtcio]") #endif //SOC_RTCIO_HOLD_SUPPORTED #endif //SOC_RTCIO_INPUT_OUTPUT_SUPPORTED -#if !CONFIG_IDF_TARGET_ESP32H2 // TODO: IDF-6268 // It is not necessary to test every rtcio pin, it will take too much ci testing time for deep sleep // Only tests on s_test_map[TEST_RTCIO_DEEP_SLEEP_PIN_INDEX] pin // (ESP32: IO25, ESP32S2, S3: IO6, C6: IO5, H2: IO12) these pads' default configuration is low level @@ -390,4 +389,3 @@ static void rtcio_deep_sleep_hold_test_second_stage(void) TEST_CASE_MULTIPLE_STAGES("RTCIO_deep_sleep_output_hold_test", "[rtcio]", rtcio_deep_sleep_hold_test_first_stage, rtcio_deep_sleep_hold_test_second_stage) -#endif diff --git a/components/esp_system/test_apps/esp_system_unity_tests/main/test_sleep.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_sleep.c index 8ae49e9948..23c4e71ef6 100644 --- a/components/esp_system/test_apps/esp_system_unity_tests/main/test_sleep.c +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/test_sleep.c @@ -41,7 +41,6 @@ __attribute__((unused)) static struct timeval tv_start, tv_stop; -#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32H2) static void check_sleep_reset(void) { @@ -666,4 +665,3 @@ TEST_CASE("wake up using GPIO (2 or 4 low)", "[deepsleep][ignore]") esp_deep_sleep_start(); } #endif // SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP -#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32H2) TODO: IDF-6268 diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml index 24bf39b4c3..0a2e9652fa 100644 --- a/examples/system/.build-test-rules.yml +++ b/examples/system/.build-test-rules.yml @@ -20,15 +20,9 @@ examples/system/console/basic: - if: IDF_TARGET not in ["esp32", "esp32c3"] reason: Sufficient to run this app on one chip with each architecture -examples/system/deep_sleep: - disable: - - if: IDF_TARGET in ["esp32h2"] - temporary: true - reason: target(s) not supported yet # IDF-6268 - examples/system/deep_sleep_wake_stub: disable: - - if: IDF_TARGET in ["esp32c2", "esp32h2"] + - if: IDF_TARGET in ["esp32c2"] temporary: true reason: target(s) is not supported yet diff --git a/examples/system/console/advanced/components/cmd_system/CMakeLists.txt b/examples/system/console/advanced/components/cmd_system/CMakeLists.txt index ee5d2c4d48..4c0eae43a7 100644 --- a/examples/system/console/advanced/components/cmd_system/CMakeLists.txt +++ b/examples/system/console/advanced/components/cmd_system/CMakeLists.txt @@ -2,6 +2,4 @@ idf_component_register(SRCS "cmd_system.c" "cmd_system_common.c" INCLUDE_DIRS . REQUIRES console spi_flash driver) -if(NOT CONFIG_IDF_TARGET_ESP32H2) # IDF-6268 - target_sources(${COMPONENT_LIB} PRIVATE cmd_system_sleep.c) -endif() +target_sources(${COMPONENT_LIB} PRIVATE cmd_system_sleep.c) diff --git a/examples/system/console/advanced/components/cmd_system/cmd_system.c b/examples/system/console/advanced/components/cmd_system/cmd_system.c index 4c267b56bd..01b3cf9180 100644 --- a/examples/system/console/advanced/components/cmd_system/cmd_system.c +++ b/examples/system/console/advanced/components/cmd_system/cmd_system.c @@ -14,7 +14,5 @@ void register_system(void) { register_system_common(); -#ifndef CONFIG_IDF_TARGET_ESP32H2 // IDF-6268 register_system_sleep(); -#endif } diff --git a/examples/system/console/advanced/main/console_example_main.c b/examples/system/console/advanced/main/console_example_main.c index b83b5ab77f..dba157f544 100644 --- a/examples/system/console/advanced/main/console_example_main.c +++ b/examples/system/console/advanced/main/console_example_main.c @@ -167,9 +167,7 @@ void app_main(void) /* Register commands */ esp_console_register_help_command(); register_system_common(); -#ifndef CONFIG_IDF_TARGET_ESP32H2 // needs deep sleep support, IDF-6268 register_system_sleep(); -#endif #if SOC_WIFI_SUPPORTED register_wifi(); #endif diff --git a/examples/system/console/basic/main/console_example_main.c b/examples/system/console/basic/main/console_example_main.c index 2ce8565a15..5ff13f33a2 100644 --- a/examples/system/console/basic/main/console_example_main.c +++ b/examples/system/console/basic/main/console_example_main.c @@ -91,9 +91,7 @@ void app_main(void) /* Register commands */ esp_console_register_help_command(); register_system_common(); -#ifndef CONFIG_IDF_TARGET_ESP32H2 // needs deep sleep support, IDF-6268 register_system_sleep(); -#endif #if SOC_WIFI_SUPPORTED register_wifi(); #endif diff --git a/examples/system/deep_sleep/README.md b/examples/system/deep_sleep/README.md index dc1443740b..45cc87ad92 100644 --- a/examples/system/deep_sleep/README.md +++ b/examples/system/deep_sleep/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Deep Sleep Example diff --git a/examples/system/deep_sleep/pytest_deep_sleep.py b/examples/system/deep_sleep/pytest_deep_sleep.py index 2da08f2fc6..83536fc452 100644 --- a/examples/system/deep_sleep/pytest_deep_sleep.py +++ b/examples/system/deep_sleep/pytest_deep_sleep.py @@ -12,18 +12,28 @@ touch_wake_up_support = ['esp32', 'esp32s2'] CONFIGS = [ pytest.param('esp32_singlecore', marks=[pytest.mark.esp32]), - pytest.param('basic', marks=[pytest.mark.esp32, pytest.mark.esp32s2, pytest.mark.esp32s3, pytest.mark.esp32c3, pytest.mark.esp32c6, pytest.mark.esp32c2]), + pytest.param( + 'basic', + marks=[ + pytest.mark.esp32, + pytest.mark.esp32s2, + pytest.mark.esp32s3, + pytest.mark.esp32c3, + pytest.mark.esp32c6, + pytest.mark.esp32h2, + pytest.mark.esp32c2, + ], + ), ] @pytest.mark.parametrize('config', CONFIGS, indirect=True) @pytest.mark.generic def test_deep_sleep(dut: Dut) -> None: - def expect_enable_deep_sleep_touch() -> None: # different targets configure different wake pin(s) wake_pads = { - 'esp32': [8,9], + 'esp32': [8, 9], 'esp32s2': [9], }[dut.target] diff --git a/examples/system/deep_sleep_wake_stub/README.md b/examples/system/deep_sleep_wake_stub/README.md index 17eb4f1ce7..f900f7cc5c 100644 --- a/examples/system/deep_sleep_wake_stub/README.md +++ b/examples/system/deep_sleep_wake_stub/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Deep Sleep Wake Stub Example diff --git a/examples/system/deep_sleep_wake_stub/pytest_deep_sleep_wake_stub.py b/examples/system/deep_sleep_wake_stub/pytest_deep_sleep_wake_stub.py index 3ec97d3452..c2e2597bcc 100644 --- a/examples/system/deep_sleep_wake_stub/pytest_deep_sleep_wake_stub.py +++ b/examples/system/deep_sleep_wake_stub/pytest_deep_sleep_wake_stub.py @@ -13,6 +13,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s3 @pytest.mark.esp32c3 @pytest.mark.esp32c6 +@pytest.mark.esp32h2 @pytest.mark.generic @pytest.mark.parametrize('config', ['default',], indirect=True) def test_deep_sleep_wake_stub(config: str, dut: Dut) -> None: