mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'ci/re-enable_spi_lcd_test_on_p4_v5.3' into 'release/v5.3'
Ci(spi_lcd): re-enable spi lcd test on p4 (v5.3) See merge request espressif/esp-idf!32073
This commit is contained in:
commit
9c874ee95d
@ -52,7 +52,3 @@ components/esp_lcd/test_apps/spi_lcd:
|
|||||||
- esp_driver_spi
|
- esp_driver_spi
|
||||||
disable:
|
disable:
|
||||||
- if: SOC_GPSPI_SUPPORTED != 1
|
- if: SOC_GPSPI_SUPPORTED != 1
|
||||||
disable_test:
|
|
||||||
- if: IDF_TARGET == "esp32p4"
|
|
||||||
temporary: true
|
|
||||||
reason: test not pass, should be re-enable # TODO: IDF-8975
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
|
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@ -28,6 +28,20 @@ extern "C" {
|
|||||||
#define TEST_LCD_DC_GPIO 1
|
#define TEST_LCD_DC_GPIO 1
|
||||||
#define TEST_LCD_PCLK_GPIO 2
|
#define TEST_LCD_PCLK_GPIO 2
|
||||||
#define TEST_LCD_DATA0_GPIO 4
|
#define TEST_LCD_DATA0_GPIO 4
|
||||||
|
#elif CONFIG_IDF_TARGET_ESP32P4
|
||||||
|
#define TEST_LCD_BK_LIGHT_GPIO 23
|
||||||
|
#define TEST_LCD_RST_GPIO 6
|
||||||
|
#define TEST_LCD_CS_GPIO 4
|
||||||
|
#define TEST_LCD_DC_GPIO 3
|
||||||
|
#define TEST_LCD_PCLK_GPIO 2
|
||||||
|
#define TEST_LCD_DATA0_GPIO 32
|
||||||
|
#define TEST_LCD_DATA1_GPIO 33
|
||||||
|
#define TEST_LCD_DATA2_GPIO 22
|
||||||
|
#define TEST_LCD_DATA3_GPIO 8
|
||||||
|
#define TEST_LCD_DATA4_GPIO 21
|
||||||
|
#define TEST_LCD_DATA5_GPIO 53
|
||||||
|
#define TEST_LCD_DATA6_GPIO 20
|
||||||
|
#define TEST_LCD_DATA7_GPIO 5
|
||||||
#else
|
#else
|
||||||
#define TEST_LCD_BK_LIGHT_GPIO 18
|
#define TEST_LCD_BK_LIGHT_GPIO 18
|
||||||
#define TEST_LCD_RST_GPIO 5
|
#define TEST_LCD_RST_GPIO 5
|
||||||
|
@ -1,11 +1,9 @@
|
|||||||
# SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
|
# SPDX-FileCopyrightText: 2021-2022 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
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='esp32p4 support TBD') # TODO: IDF-8975
|
|
||||||
@pytest.mark.supported_targets
|
@pytest.mark.supported_targets
|
||||||
@pytest.mark.generic
|
@pytest.mark.generic
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
|
@ -42,6 +42,7 @@ extern "C" {
|
|||||||
#define SPI_LL_CPU_MAX_BIT_LEN (16 * 32) //Fifo len: 16 words
|
#define SPI_LL_CPU_MAX_BIT_LEN (16 * 32) //Fifo len: 16 words
|
||||||
#define SPI_LL_SUPPORT_CLK_SRC_PRE_DIV 1 //clock source have divider before peripheral
|
#define SPI_LL_SUPPORT_CLK_SRC_PRE_DIV 1 //clock source have divider before peripheral
|
||||||
#define SPI_LL_CLK_SRC_PRE_DIV_MAX 512//div1(8bit) * div2(8bit but set const 2)
|
#define SPI_LL_CLK_SRC_PRE_DIV_MAX 512//div1(8bit) * div2(8bit but set const 2)
|
||||||
|
#define SPI_LL_MOSI_FREE_LEVEL 1 //Default level after bus initialized
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The data structure holding calculated clock configuration. Since the
|
* The data structure holding calculated clock configuration. Since the
|
||||||
@ -358,7 +359,7 @@ static inline void spi_ll_slave_reset(spi_dev_t *hw)
|
|||||||
/**
|
/**
|
||||||
* Reset SPI CPU TX FIFO
|
* Reset SPI CPU TX FIFO
|
||||||
*
|
*
|
||||||
* On P4, this function is not seperated
|
* On P4, this function is not separated
|
||||||
*
|
*
|
||||||
* @param hw Beginning address of the peripheral registers.
|
* @param hw Beginning address of the peripheral registers.
|
||||||
*/
|
*/
|
||||||
@ -371,7 +372,7 @@ static inline void spi_ll_cpu_tx_fifo_reset(spi_dev_t *hw)
|
|||||||
/**
|
/**
|
||||||
* Reset SPI CPU RX FIFO
|
* Reset SPI CPU RX FIFO
|
||||||
*
|
*
|
||||||
* On P4, this function is not seperated
|
* On P4, this function is not separated
|
||||||
*
|
*
|
||||||
* @param hw Beginning address of the peripheral registers.
|
* @param hw Beginning address of the peripheral registers.
|
||||||
*/
|
*/
|
||||||
@ -760,7 +761,7 @@ static inline void spi_ll_master_set_clock_by_reg(spi_dev_t *hw, const spi_ll_cl
|
|||||||
* Get the frequency of given dividers. Don't use in app.
|
* Get the frequency of given dividers. Don't use in app.
|
||||||
*
|
*
|
||||||
* @param fapb APB clock of the system.
|
* @param fapb APB clock of the system.
|
||||||
* @param pre Pre devider.
|
* @param pre Pre divider.
|
||||||
* @param n Main divider.
|
* @param n Main divider.
|
||||||
*
|
*
|
||||||
* @return Frequency of given dividers.
|
* @return Frequency of given dividers.
|
||||||
@ -771,10 +772,10 @@ static inline int spi_ll_freq_for_pre_n(int fapb, int pre, int n)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calculate the nearest frequency avaliable for master.
|
* Calculate the nearest frequency available for master.
|
||||||
*
|
*
|
||||||
* @param fapb APB clock of the system.
|
* @param fapb APB clock of the system.
|
||||||
* @param hz Frequncy desired.
|
* @param hz Frequency desired.
|
||||||
* @param duty_cycle Duty cycle desired.
|
* @param duty_cycle Duty cycle desired.
|
||||||
* @param out_reg Output address to store the calculated clock configurations for the return frequency.
|
* @param out_reg Output address to store the calculated clock configurations for the return frequency.
|
||||||
*
|
*
|
||||||
@ -854,7 +855,7 @@ static inline int spi_ll_master_cal_clock(int fapb, int hz, int duty_cycle, spi_
|
|||||||
*
|
*
|
||||||
* @param hw Beginning address of the peripheral registers.
|
* @param hw Beginning address of the peripheral registers.
|
||||||
* @param fapb APB clock of the system.
|
* @param fapb APB clock of the system.
|
||||||
* @param hz Frequncy desired.
|
* @param hz Frequency desired.
|
||||||
* @param duty_cycle Duty cycle desired.
|
* @param duty_cycle Duty cycle desired.
|
||||||
*
|
*
|
||||||
* @return Actual frequency that is used.
|
* @return Actual frequency that is used.
|
||||||
@ -880,6 +881,16 @@ static inline void spi_ll_set_mosi_delay(spi_dev_t *hw, int delay_mode, int dela
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine and unify the default level of mosi line when bus free
|
||||||
|
*
|
||||||
|
* @param hw Beginning address of the peripheral registers.
|
||||||
|
*/
|
||||||
|
static inline void spi_ll_set_mosi_free_level(spi_dev_t *hw, bool level)
|
||||||
|
{
|
||||||
|
hw->ctrl.d_pol = level; //set default level for MOSI only on IDLE state
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the miso delay applied to the input signal before the internal peripheral. (Preview)
|
* Set the miso delay applied to the input signal before the internal peripheral. (Preview)
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user