Skip to content

Commit fb3a982

Browse files
committed
fix(esp32p4): Fix UART test
1 parent bd85e5b commit fb3a982

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tests/validation/uart/uart.ino

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void transmit_and_check_msg(const String msg_append, bool perform_assert = true)
100100
if (perform_assert) {
101101
TEST_ASSERT_EQUAL_STRING(("Hello from Serial1 (UART1) >>> via loopback >>> Serial1 (UART1) " + msg_append).c_str(), recv_msg.c_str());
102102
}
103-
#elif SOC_UART_HP_NUM == 3
103+
#elif SOC_UART_HP_NUM >= 3
104104
Serial1.print("Hello from Serial1 (UART1) >>> to >>> Serial2 (UART2) " + msg_append);
105105
Serial1.flush();
106106
delay(100);
@@ -128,7 +128,7 @@ void task_delayed_msg(void *pvParameters) {
128128

129129
#if SOC_UART_HP_NUM == 2
130130
selected_serial = &Serial;
131-
#elif SOC_UART_HP_NUM == 3
131+
#elif SOC_UART_HP_NUM >= 3
132132
selected_serial = &Serial1;
133133
#endif
134134

@@ -150,7 +150,7 @@ void setUp(void) {
150150
onReceive_cb(Serial1);
151151
});
152152
uart_internal_loopback(1, RX1);
153-
#elif SOC_UART_HP_NUM == 3
153+
#elif SOC_UART_HP_NUM >= 3
154154
log_d("Setup internal loop-back between Serial1 (UART1) <<--->> Serial2 (UART2)");
155155

156156
Serial1.onReceive([]() {
@@ -225,7 +225,7 @@ void change_baudrate_test(void) {
225225
Serial1.updateBaudRate(9600);
226226
TEST_ASSERT_UINT_WITHIN(192, 9600, Serial1.baudRate());
227227

228-
#if SOC_UART_HP_NUM == 3
228+
#if SOC_UART_HP_NUM >= 3
229229
Serial2.updateBaudRate(9600);
230230
TEST_ASSERT_UINT_WITHIN(192, 9600, Serial2.baudRate());
231231
#endif
@@ -239,7 +239,7 @@ void change_baudrate_test(void) {
239239
//Baudrate error should be within 2% of the target baudrate
240240
TEST_ASSERT_UINT_WITHIN(2304, 115200, Serial1.baudRate());
241241

242-
#if SOC_UART_HP_NUM == 3
242+
#if SOC_UART_HP_NUM >= 3
243243
TEST_ASSERT_UINT_WITHIN(2304, 115200, Serial2.baudRate());
244244
#endif
245245

@@ -421,7 +421,7 @@ void change_pins_test(void) {
421421

422422
#if SOC_UART_HP_NUM == 2
423423
esp_rom_gpio_connect_out_signal(SOC_RX0, SIG_GPIO_OUT_IDX, false, false);
424-
#elif SOC_UART_HP_NUM == 3
424+
#elif SOC_UART_HP_NUM >= 3
425425
esp_rom_gpio_connect_out_signal(RX1, SIG_GPIO_OUT_IDX, false, false);
426426
esp_rom_gpio_connect_out_signal(RX2, SIG_GPIO_OUT_IDX, false, false);
427427
#endif
@@ -432,7 +432,7 @@ void change_pins_test(void) {
432432
Serial1.setPins(NEW_RX1, NEW_TX1);
433433
TEST_ASSERT_EQUAL(NEW_RX1, uart_get_RxPin(1));
434434
TEST_ASSERT_EQUAL(NEW_TX1, uart_get_TxPin(1));
435-
#elif SOC_UART_HP_NUM == 3
435+
#elif SOC_UART_HP_NUM >= 3
436436
Serial1.setPins(RX2, TX2);
437437
Serial2.setPins(RX1, TX1);
438438
TEST_ASSERT_EQUAL(RX2, uart_get_RxPin(1));
@@ -447,7 +447,7 @@ void change_pins_test(void) {
447447

448448
#if SOC_UART_HP_NUM == 2
449449
uart_internal_loopback(1, NEW_RX1);
450-
#elif SOC_UART_HP_NUM == 3
450+
#elif SOC_UART_HP_NUM >= 3
451451
uart_internal_loopback(1, RX1);
452452
uart_internal_loopback(2, RX2);
453453
#endif
@@ -470,7 +470,7 @@ void auto_baudrate_test(void) {
470470
#if SOC_UART_HP_NUM == 2
471471
selected_serial = &Serial1;
472472
uart_internal_loopback(0, RX1);
473-
#elif SOC_UART_HP_NUM == 3
473+
#elif SOC_UART_HP_NUM >= 3
474474
selected_serial = &Serial2;
475475
#endif
476476

@@ -504,7 +504,7 @@ void periman_test(void) {
504504

505505
Wire.begin(RX1, TX1);
506506

507-
#if SOC_UART_HP_NUM == 3
507+
#if SOC_UART_HP_NUM >= 3
508508
Wire1.begin(RX2, TX2);
509509
#endif
510510

@@ -518,7 +518,7 @@ void periman_test(void) {
518518

519519
Serial1.setPins(RX1, TX1);
520520

521-
#if SOC_UART_HP_NUM == 3
521+
#if SOC_UART_HP_NUM >= 3
522522
Serial2.setPins(RX2, TX2);
523523
uart_internal_loopback(1, RX2);
524524
uart_internal_loopback(2, RX1);
@@ -577,7 +577,7 @@ void setup() {
577577
onReceive_cb(Serial1);
578578
});
579579
uart_internal_loopback(1, RX1);
580-
#elif SOC_UART_HP_NUM == 3
580+
#elif SOC_UART_HP_NUM >= 3
581581
log_d("Setup internal loop-back between Serial1 (UART1) <<--->> Serial2 (UART2)");
582582

583583
Serial1.onReceive([]() {

0 commit comments

Comments
 (0)