espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-06 06:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/support_spi_on_728' into 'master'

Browse Source 
spi_master: enable a unit test closed on esp32s3 before

Closes IDF-3226

See merge request espressif/esp-idf!13845
This commit is contained in:
Michael (XIAO Xufeng)
2021-06-27 05:41:10 +00:00
parent 98594315c8 6a49ceb67e
commit 25f5fc7d6f
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/driver/test/test_spi_master.c
View File

@@ -958,7 +958,6 @@ TEST_CASE("SPI master variable dummy test", "[spi]")
master_free_device_bus(spi); master_free_device_bus(spi);
} }
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3)
/** /**
* This test is to check when the first transaction of the HD master is to send data without receiving data via DMA, * This test is to check when the first transaction of the HD master is to send data without receiving data via DMA,
* then if the master could receive data correctly. * then if the master could receive data correctly.
@@ -974,7 +973,7 @@ TEST_CASE("SPI master variable dummy test", "[spi]")
TEST_CASE("SPI master hd dma TX without RX test", "[spi]") TEST_CASE("SPI master hd dma TX without RX test", "[spi]")
{ {
spi_bus_config_t bus_cfg = SPI_BUS_TEST_DEFAULT_CONFIG(); spi_bus_config_t bus_cfg = SPI_BUS_TEST_DEFAULT_CONFIG();
TEST_ESP_OK(spi_bus_initialize(TEST_SPI_HOST, &bus_cfg, TEST_SPI_HOST)); TEST_ESP_OK(spi_bus_initialize(TEST_SPI_HOST, &bus_cfg, SPI_DMA_CH_AUTO));
spi_device_handle_t spi; spi_device_handle_t spi;
spi_device_interface_config_t dev_cfg = SPI_DEVICE_TEST_DEFAULT_CONFIG(); spi_device_interface_config_t dev_cfg = SPI_DEVICE_TEST_DEFAULT_CONFIG();
@@ -983,9 +982,7 @@ TEST_CASE("SPI master hd dma TX without RX test", "[spi]")
TEST_ESP_OK(spi_bus_add_device(TEST_SPI_HOST, &dev_cfg, &spi)); TEST_ESP_OK(spi_bus_add_device(TEST_SPI_HOST, &dev_cfg, &spi));
spi_slave_interface_config_t slave_cfg = SPI_SLAVE_TEST_DEFAULT_CONFIG(); spi_slave_interface_config_t slave_cfg = SPI_SLAVE_TEST_DEFAULT_CONFIG();
TEST_ESP_OK(spi_slave_initialize(TEST_SLAVE_HOST, &bus_cfg, &slave_cfg, SPI_DMA_CH_AUTO));
printf("TEST_SLAVE_HOST is %d\n", TEST_SLAVE_HOST);
TEST_ESP_OK(spi_slave_initialize(TEST_SLAVE_HOST, &bus_cfg, &slave_cfg, TEST_SLAVE_HOST));
same_pin_func_sel(bus_cfg, dev_cfg, 0); same_pin_func_sel(bus_cfg, dev_cfg, 0);
@@ -1049,7 +1046,6 @@ TEST_CASE("SPI master hd dma TX without RX test", "[spi]")
spi_slave_free(TEST_SLAVE_HOST); spi_slave_free(TEST_SLAVE_HOST);
master_free_device_bus(spi); master_free_device_bus(spi);
} }
#endif // #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3)
//There is only one GPSPI controller, so single-board test is disabled. //There is only one GPSPI controller, so single-board test is disabled.
#endif //#if !DISABLED_FOR_TARGETS(ESP32C3) #endif //#if !DISABLED_FOR_TARGETS(ESP32C3)

3
components/driver/test/test_spi_slave_hd.c
View File

@@ -19,8 +19,6 @@
#if !DISABLED_FOR_TARGETS(ESP32C3) #if !DISABLED_FOR_TARGETS(ESP32C3)
//There is only one GPSPI controller on ESP32C3, so single-board test is disabled. //There is only one GPSPI controller on ESP32C3, so single-board test is disabled.
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3)
// TODO ESP32S3 IDF-3226
#if SOC_SPI_SUPPORT_SLAVE_HD_VER2 #if SOC_SPI_SUPPORT_SLAVE_HD_VER2
#include "driver/spi_slave_hd.h" #include "driver/spi_slave_hd.h"
@@ -597,7 +595,6 @@ TEST_CASE("test spi slave hd segment mode, master too long", "[spi][spi_slv_hd]"
} }
#endif //SOC_SPI_SUPPORT_SLAVE_HD_VER2 #endif //SOC_SPI_SUPPORT_SLAVE_HD_VER2
#endif //!TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3)
#endif //#if !DISABLED_FOR_TARGETS(ESP32C3) #endif //#if !DISABLED_FOR_TARGETS(ESP32C3)
#if !DISABLED_FOR_TARGETS(ESP32, ESP32S2, ESP32S3) #if !DISABLED_FOR_TARGETS(ESP32, ESP32S2, ESP32S3)