Merge branch 'test/enable_isp_test_esp32p4_rev1_v6.1' into 'release/v6.1'

fix(isp): enable esp32p4_rev1 unit test (v6.1)

See merge request espressif/esp-idf!49229
This commit is contained in:
morris
2026-06-05 17:02:22 +08:00
2 changed files with 16 additions and 16 deletions
@@ -215,7 +215,7 @@ TEST_CASE("ISP CCM basic function", "[isp]")
esp_isp_ccm_config_t ccm_cfg = { esp_isp_ccm_config_t ccm_cfg = {
.matrix = { .matrix = {
{16.0, 0.0, 0.0}, {17.0, 0.0, 0.0},
{0.0, 1.0, 0.0}, {0.0, 1.0, 0.0},
{0.0, 0.0, 1.0} {0.0, 0.0, 1.0}
}, },
@@ -228,7 +228,7 @@ TEST_CASE("ISP CCM basic function", "[isp]")
TEST_ESP_ERR(ESP_ERR_INVALID_ARG, esp_isp_ccm_configure(isp_proc, &ccm_cfg)); TEST_ESP_ERR(ESP_ERR_INVALID_ARG, esp_isp_ccm_configure(isp_proc, &ccm_cfg));
// saturation case // saturation case
ccm_cfg.matrix[0][0] = 5.0; ccm_cfg.matrix[0][0] = 3.0;
ccm_cfg.saturation = true; ccm_cfg.saturation = true;
TEST_ESP_OK(esp_isp_ccm_configure(isp_proc, &ccm_cfg)); TEST_ESP_OK(esp_isp_ccm_configure(isp_proc, &ccm_cfg));
TEST_ESP_OK(esp_isp_ccm_enable(isp_proc)); TEST_ESP_OK(esp_isp_ccm_enable(isp_proc));
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
import pytest import pytest
from pytest_embedded import Dut from pytest_embedded import Dut
@@ -20,16 +20,16 @@ def test_isp(dut: Dut) -> None:
dut.run_all_single_board_cases() dut.run_all_single_board_cases()
# TODO: IDF-15006 @pytest.mark.camera
# @pytest.mark.generic @pytest.mark.ov5647
# @pytest.mark.esp32p4_rev1 @pytest.mark.esp32p4_rev1
# @pytest.mark.parametrize( @pytest.mark.parametrize(
# 'config', 'config',
# [ [
# ('esp32p4_rev1'), ('esp32p4_rev1'),
# ], ],
# indirect=True, indirect=True,
# ) )
# @idf_parametrize('target', ['esp32p4'], indirect=['target']) @idf_parametrize('target', ['esp32p4'], indirect=['target'])
# def test_isp_esp32p4_rev2(dut: Dut) -> None: def test_isp_esp32p4_rev1(dut: Dut) -> None:
# dut.run_all_single_board_cases() dut.run_all_single_board_cases()