Skip to content

Commit 2e0f520

Browse files
committed
Merge branch 'fix/fix_spi_master_test_fail_v5.5' into 'release/v5.5'
fix(driver_spi): fixed test app fail (v5.5) See merge request espressif/esp-idf!43065
2 parents d1f4a0c + 88e3335 commit 2e0f520

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

components/esp_driver_spi/test_apps/master/main/test_spi_master.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,7 +1854,6 @@ TEST_CASE("test_spi_master_sleep_retention", "[spi]")
18541854
spi_device_interface_config_t devcfg = SPI_DEVICE_TEST_DEFAULT_CONFIG();
18551855
buscfg.flags |= SPICOMMON_BUSFLAG_GPIO_PINS;
18561856
buscfg.flags |= SPICOMMON_BUSFLAG_SLP_ALLOW_PD;
1857-
buscfg.miso_io_num = buscfg.mosi_io_num; // set spi "self-loop"
18581857
uint8_t send[16] = "hello spi x\n";
18591858
uint8_t recv[16];
18601859
spi_transaction_t trans_cfg = {
@@ -1871,6 +1870,8 @@ TEST_CASE("test_spi_master_sleep_retention", "[spi]")
18711870
#endif
18721871
printf("Retention on GPSPI%d with dma: %d\n", periph + 1, use_dma);
18731872
TEST_ESP_OK(spi_bus_initialize(periph, &buscfg, use_dma));
1873+
// set spi "self-loop" after bus initialized
1874+
spitest_gpio_output_sel(buscfg.miso_io_num, FUNC_GPIO, spi_periph_signal[periph].spid_out);
18741875
TEST_ESP_OK(spi_bus_add_device(periph, &devcfg, &dev_handle));
18751876

18761877
for (uint8_t cnt = 0; cnt < 3; cnt ++) {
@@ -1925,8 +1926,9 @@ TEST_CASE("test_spi_master_auto_sleep_retention", "[spi]")
19251926
spi_bus_config_t buscfg = SPI_BUS_TEST_DEFAULT_CONFIG();
19261927
buscfg.flags = (allow_pd) ? SPICOMMON_BUSFLAG_SLP_ALLOW_PD : 0;
19271928
buscfg.flags |= SPICOMMON_BUSFLAG_GPIO_PINS;
1928-
buscfg.miso_io_num = buscfg.mosi_io_num; // set spi "self-loop"
19291929
TEST_ESP_OK(spi_bus_initialize(TEST_SPI_HOST, &buscfg, SPI_DMA_DISABLED));
1930+
// set spi "self-loop" after bus initialized
1931+
spitest_gpio_output_sel(buscfg.miso_io_num, FUNC_GPIO, spi_periph_signal[TEST_SPI_HOST].spid_out);
19301932

19311933
spi_device_handle_t dev_handle;
19321934
spi_device_interface_config_t devcfg = SPI_DEVICE_TEST_DEFAULT_CONFIG();

0 commit comments

Comments
 (0)