From 5b1a8bddfbef949a12768e0a2697345cfb6374c1 Mon Sep 17 00:00:00 2001 From: morris Date: Tue, 18 Nov 2025 18:56:46 +0800 Subject: [PATCH] fix(dsi): test apps manifest error --- components/esp_hw_support/port/esp32p4/peripheral_domain_pd.c | 4 ++-- components/esp_lcd/test_apps/.build-test-rules.yml | 2 +- .../esp_lcd/test_apps/mipi_dsi_lcd/pytest_mipi_dsi_lcd.py | 2 ++ components/soc/esp32p4/include/soc/reset_reasons.h | 1 + examples/peripherals/.build-test-rules.yml | 2 +- examples/peripherals/lcd/mipi_dsi/main/Kconfig.projbuild | 2 +- .../peripherals/lcd/mipi_dsi/pytest_mipi_dsi_panel_lvgl.py | 4 ++-- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/components/esp_hw_support/port/esp32p4/peripheral_domain_pd.c b/components/esp_hw_support/port/esp32p4/peripheral_domain_pd.c index 4ab9fcaec41..773dfbcb738 100644 --- a/components/esp_hw_support/port/esp32p4/peripheral_domain_pd.c +++ b/components/esp_hw_support/port/esp32p4/peripheral_domain_pd.c @@ -28,7 +28,7 @@ bool peripheral_domain_pd_allowed(void) RETENTION_MODULE_BITMAP_SET(&mask, SLEEP_RETENTION_MODULE_TG0_TIMER1); RETENTION_MODULE_BITMAP_SET(&mask, SLEEP_RETENTION_MODULE_TG1_TIMER1); - // TODO: IDF-11369 + // TODO: IDF-9921 // RETENTION_MODULE_BITMAP_SET(&mask, SLEEP_RETENTION_MODULE_ADC); // ESP32P4 supports UART sleep retention @@ -41,7 +41,7 @@ bool peripheral_domain_pd_allowed(void) // ESP32P4 supports RMT sleep retention RETENTION_MODULE_BITMAP_SET(&mask, SLEEP_RETENTION_MODULE_RMT0); - // TODO: IDF-11371 + // TODO: IDF-9962 // RETENTION_MODULE_BITMAP_SET(&mask, SLEEP_RETENTION_MODULE_GDMA_CH0); // RETENTION_MODULE_BITMAP_SET(&mask, SLEEP_RETENTION_MODULE_GDMA_CH1); // RETENTION_MODULE_BITMAP_SET(&mask, SLEEP_RETENTION_MODULE_GDMA_CH2); diff --git a/components/esp_lcd/test_apps/.build-test-rules.yml b/components/esp_lcd/test_apps/.build-test-rules.yml index 475240be565..cb9ec57a2f1 100644 --- a/components/esp_lcd/test_apps/.build-test-rules.yml +++ b/components/esp_lcd/test_apps/.build-test-rules.yml @@ -28,7 +28,7 @@ components/esp_lcd/test_apps/mipi_dsi_lcd: - esp_hw_support - soc disable: - - if: SOC_LCD_MIPI_DSI_SUPPORTED != 1 + - if: SOC_MIPI_DSI_SUPPORTED != 1 disable_test: - if: IDF_TARGET == "esp32p4" temporary: true diff --git a/components/esp_lcd/test_apps/mipi_dsi_lcd/pytest_mipi_dsi_lcd.py b/components/esp_lcd/test_apps/mipi_dsi_lcd/pytest_mipi_dsi_lcd.py index 4f1c0a6a89a..23948f8e75c 100644 --- a/components/esp_lcd/test_apps/mipi_dsi_lcd/pytest_mipi_dsi_lcd.py +++ b/components/esp_lcd/test_apps/mipi_dsi_lcd/pytest_mipi_dsi_lcd.py @@ -15,6 +15,7 @@ from pytest_embedded_idf.utils import idf_parametrize indirect=True, ) @idf_parametrize('target', ['esp32p4'], indirect=['target']) +@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='no runner') def test_dsi_lcd(dut: Dut) -> None: dut.run_all_single_board_cases() @@ -28,6 +29,7 @@ def test_dsi_lcd(dut: Dut) -> None: indirect=True, ) @idf_parametrize('target', ['esp32p4'], indirect=['target']) +@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='no runner') def test_dsi_lcd_with_virt_flash_enc(dut: Dut) -> None: print(' - Erase flash') dut.serial.erase_flash() diff --git a/components/soc/esp32p4/include/soc/reset_reasons.h b/components/soc/esp32p4/include/soc/reset_reasons.h index 6d27a6e6ab8..264ef980675 100644 --- a/components/soc/esp32p4/include/soc/reset_reasons.h +++ b/components/soc/esp32p4/include/soc/reset_reasons.h @@ -46,6 +46,7 @@ typedef enum { RESET_REASON_CORE_USB_UART = 0x17, // USB Serial/JTAG controller's UART resets the digital core RESET_REASON_CPU_JTAG = 0x18, // Triggered when a reset command from JTAG is received RESET_REASON_CPU_LOCKUP = 0x1A, // Triggered when the CPU enters lockup (exception inside the exception handler would cause this) + RESET_REASON_SYS_PSDET = 0x1B, // Power supply detect a glitch (>50ns) } soc_reset_reason_t; #ifdef __cplusplus diff --git a/examples/peripherals/.build-test-rules.yml b/examples/peripherals/.build-test-rules.yml index 256eb1d4d8b..aa7da3d8cd5 100644 --- a/examples/peripherals/.build-test-rules.yml +++ b/examples/peripherals/.build-test-rules.yml @@ -320,7 +320,7 @@ examples/peripherals/lcd/i80_controller: examples/peripherals/lcd/mipi_dsi: disable: - - if: SOC_LCD_MIPI_DSI_SUPPORTED != 1 + - if: SOC_MIPI_DSI_SUPPORTED != 1 depends_components: - esp_driver_dma - esp_hal_lcd diff --git a/examples/peripherals/lcd/mipi_dsi/main/Kconfig.projbuild b/examples/peripherals/lcd/mipi_dsi/main/Kconfig.projbuild index dd92087a345..b38831591a5 100644 --- a/examples/peripherals/lcd/mipi_dsi/main/Kconfig.projbuild +++ b/examples/peripherals/lcd/mipi_dsi/main/Kconfig.projbuild @@ -15,7 +15,7 @@ menu "Example Configuration" choice prompt "Select MIPI LCD model" - default EXAMPLE_LCD_EK79007_SUPPORT + default EXAMPLE_LCD_USE_EK79007 help Select LCD controller model. diff --git a/examples/peripherals/lcd/mipi_dsi/pytest_mipi_dsi_panel_lvgl.py b/examples/peripherals/lcd/mipi_dsi/pytest_mipi_dsi_panel_lvgl.py index c2ef9477765..ae1f96e9296 100644 --- a/examples/peripherals/lcd/mipi_dsi/pytest_mipi_dsi_panel_lvgl.py +++ b/examples/peripherals/lcd/mipi_dsi/pytest_mipi_dsi_panel_lvgl.py @@ -7,5 +7,5 @@ from pytest_embedded_idf.utils import idf_parametrize @pytest.mark.generic @idf_parametrize('target', ['esp32p4'], indirect=['target']) -def test_rgb_lcd_lvgl(dut: Dut) -> None: - dut.expect_exact('example: Install MIPI DSI LCD control panel') +def test_mipi_dsi_lcd_lvgl(dut: Dut) -> None: + dut.expect_exact('Calling app_main()')