From dd8076acf4a3aae03264a1ae907c5382e71106e2 Mon Sep 17 00:00:00 2001 From: Armando Date: Mon, 8 Feb 2021 10:43:14 +0800 Subject: [PATCH 1/2] spi: update slv dual board test for ci due to no pullup resistor on io10 on c3 --- components/driver/test/test_spi_slave.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/components/driver/test/test_spi_slave.c b/components/driver/test/test_spi_slave.c index ab1f145cf0..64064c0f9f 100644 --- a/components/driver/test/test_spi_slave.c +++ b/components/driver/test/test_spi_slave.c @@ -176,6 +176,8 @@ static void unaligned_test_master(void) devcfg.queue_size = 7; TEST_ESP_OK(spi_bus_add_device(TEST_SPI_HOST, &devcfg, &spi)); + unity_send_signal("Master ready"); + uint8_t *master_send_buf = heap_caps_malloc(BUF_SIZE, MALLOC_CAP_DMA); uint8_t *master_recv_buf = heap_caps_calloc(BUF_SIZE, 1, MALLOC_CAP_DMA); //This buffer is used for 2-board test and should be assigned totally the same as the ``test_slave_loop`` does. @@ -197,7 +199,8 @@ static void unaligned_test_master(void) .length = length_in_bytes * 8, }; - unity_wait_for_signal("slave ready"); + vTaskDelay(50); + unity_wait_for_signal("Slave ready"); TEST_ESP_OK(spi_device_transmit(spi, (spi_transaction_t*)&t)); //show result @@ -218,6 +221,7 @@ static void unaligned_test_master(void) static void unaligned_test_slave(void) { + unity_wait_for_signal("Master ready"); spi_bus_config_t buscfg = SPI_BUS_TEST_DEFAULT_CONFIG(); spi_slave_interface_config_t slvcfg = SPI_SLAVE_TEST_DEFAULT_CONFIG(); TEST_ESP_OK(spi_slave_initialize(TEST_SLAVE_HOST, &buscfg, &slvcfg, SPI_DMA_CH_AUTO)); @@ -243,7 +247,7 @@ static void unaligned_test_slave(void) .length = 32 * 8, }; - unity_send_signal("slave ready"); + unity_send_signal("Slave ready"); TEST_ESP_OK(spi_slave_transmit(TEST_SLAVE_HOST, &slave_t, portMAX_DELAY)); //show result @@ -264,7 +268,6 @@ static void unaligned_test_slave(void) TEST_ASSERT(spi_slave_free(TEST_SLAVE_HOST) == ESP_OK); } -TEST_CASE_MULTIPLE_DEVICES("SPI_Slave_Unaligned_Test", "[spi_ms][spi_slave]", unaligned_test_master, unaligned_test_slave); - +TEST_CASE_MULTIPLE_DEVICES("SPI_Slave_Unaligned_Test", "[spi_ms][test_env=Example_SPI_Multi_device][timeout=120]", unaligned_test_master, unaligned_test_slave); #endif //#if !DISABLED_FOR_TARGETS(ESP32, ESP32S2, ESP32S3) From 01b5ef31b401189be6fdff883f73eb59722d4b62 Mon Sep 17 00:00:00 2001 From: Armando Date: Tue, 16 Mar 2021 15:56:15 +0800 Subject: [PATCH 2/2] spi_slave: enable spi slave dual board test on esp32c3 --- .gitlab/ci/target-test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 4a11cf7a3b..fbcbf91c37 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -581,6 +581,13 @@ UT_C3_FLASH: - ESP32C3_IDF - UT_T1_ESP_FLASH +UT_C3_SPI_DUAL: + extends: .unit_test_esp32c3_template + parallel: 2 + tags: + - ESP32C3_IDF + - Example_SPI_Multi_device + .integration_test_template: extends: - .target_test_job_template