Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci/enable_s31_ulp_multi_dev_v6.1' into 'release/v6.1'

Browse Source 
ci(ulp): re-enable multi dev tests for S31 ULP (v6.1)

See merge request espressif/esp-idf!51143
This commit is contained in:
Jiang Jiang Jian
2026-07-30 17:56:34 +08:00
parent b6a182a0d9 a5dfeca61d
commit 24718710ad
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_hal_uart/esp32s31/include/hal/uart_ll.h
+20 -1
View File
@@ -1234,7 +1234,23 @@ FORCE_INLINE_ATTR void uart_ll_set_wakeup_fifo_thrd(uart_dev_t *hw, uint32_t wak
*/ */
FORCE_INLINE_ATTR void uart_ll_set_wakeup_mode(uart_dev_t *hw, uart_wakeup_mode_t mode) FORCE_INLINE_ATTR void uart_ll_set_wakeup_mode(uart_dev_t *hw, uart_wakeup_mode_t mode)
{ {
switch (mode) {
case UART_WK_MODE_ACTIVE_THRESH:
hw->sleep_conf2.wk_mode_sel = 0;
break;
case UART_WK_MODE_FIFO_THRESH:
hw->sleep_conf2.wk_mode_sel = 1;
break;
case UART_WK_MODE_START_BIT:
hw->sleep_conf2.wk_mode_sel = 2;
break;
case UART_WK_MODE_CHAR_SEQ:
hw->sleep_conf2.wk_mode_sel = 3;
break;
default:
abort();
break;
}
} }
/** /**
@@ -1287,6 +1303,9 @@ FORCE_INLINE_ATTR void uart_ll_set_char_seq_wk_char(uart_dev_t *hw, uint32_t cha
case 3: case 3:
HAL_FORCE_MODIFY_U32_REG_FIELD(hw->sleep_conf0, wk_char3, value); HAL_FORCE_MODIFY_U32_REG_FIELD(hw->sleep_conf0, wk_char3, value);
break; break;
case 4:
HAL_FORCE_MODIFY_U32_REG_FIELD(hw->sleep_conf0, wk_char4, value);
break;
default: default:
abort(); abort();
break; break;
components/ulp/test_apps/lp_core/lp_core_basic_tests/pytest_lp_core_basic.py
-3
View File
@@ -51,7 +51,6 @@ def test_lp_vad(dut: Dut) -> None:
@pytest.mark.generic_multi_device @pytest.mark.generic_multi_device
@pytest.mark.temp_skip_ci(targets=['esp32s31'], reason='TODO IDF-15572 Enable ULP multi device tests for ESP32-S31')
@pytest.mark.parametrize('count', [2], indirect=True) @pytest.mark.parametrize('count', [2], indirect=True)
@pytest.mark.parametrize( @pytest.mark.parametrize(
'config', 'config',
@@ -79,7 +78,6 @@ def test_lp_core_multi_device(case_tester: CaseTester) -> None:
indirect=True, indirect=True,
) )
@idf_parametrize('target', soc_filtered_targets('SOC_ULP_LP_UART_SUPPORTED == 1'), indirect=['target']) @idf_parametrize('target', soc_filtered_targets('SOC_ULP_LP_UART_SUPPORTED == 1'), indirect=['target'])
@pytest.mark.temp_skip_ci(targets=['esp32s31'], reason='TODO IDF-15572 Enable ULP multi device tests for ESP32-S31')
def test_lp_uart_multi_device(case_tester: CaseTester) -> None: def test_lp_uart_multi_device(case_tester: CaseTester) -> None:
uart_cases = [case for case in case_tester.test_menu if 'uart' in case.groups and 'wakeup' not in case.groups] uart_cases = [case for case in case_tester.test_menu if 'uart' in case.groups and 'wakeup' not in case.groups]
for case in uart_cases: for case in uart_cases:
@@ -87,7 +85,6 @@ def test_lp_uart_multi_device(case_tester: CaseTester) -> None:
@pytest.mark.generic_multi_device @pytest.mark.generic_multi_device
@pytest.mark.temp_skip_ci(targets=['esp32s31'], reason='TODO IDF-15572 Enable ULP multi device tests for ESP32-S31')
@pytest.mark.parametrize( @pytest.mark.parametrize(
'target', 'target',
soc_filtered_targets('SOC_ULP_LP_UART_SUPPORTED == 1'), soc_filtered_targets('SOC_ULP_LP_UART_SUPPORTED == 1'),