fix(test): Fix UART test

Author: me-no-dev

tests/validation/uart/uart.ino

@@ -46,7 +46,7 @@
  *
  */
 
-#if SOC_UART_NUM == 2
+#if SOC_UART_HP_NUM == 2
 // Used for the pin swap test
 #define NEW_RX1 9
 #define NEW_TX1 10
@@ -64,14 +64,14 @@ extern int8_t uart_get_TxPin(uint8_t uart_num);
 
 // This function starts all the available test UARTs
 void start_serial(unsigned long baudrate = 115200) {
-#if SOC_UART_NUM >= 2
+#if SOC_UART_HP_NUM >= 2
   Serial1.begin(baudrate);
   while (!Serial1) {
     delay(10);
   }
 #endif
 
-#if SOC_UART_NUM >= 3
+#if SOC_UART_HP_NUM >= 3
   Serial2.begin(baudrate);
   while (!Serial2) {
     delay(10);
@@ -81,26 +81,26 @@ void start_serial(unsigned long baudrate = 115200) {
 
 // This function stops all the available test UARTs
 void stop_serial(bool hard_stop = false) {
-#if SOC_UART_NUM >= 2
+#if SOC_UART_HP_NUM >= 2
   Serial1.end(/*hard_stop*/);
 #endif
 
-#if SOC_UART_NUM >= 3
+#if SOC_UART_HP_NUM >= 3
   Serial2.end(/*hard_stop*/);
 #endif
 }
 
 // This function transmits a message and checks if it was received correctly
 void transmit_and_check_msg(const String msg_append, bool perform_assert = true) {
   delay(100);  // Wait for some settings changes to take effect
-#if SOC_UART_NUM == 2
+#if SOC_UART_HP_NUM == 2
   Serial1.print("Hello from Serial1 (UART1) >>> via loopback >>> Serial1 (UART1) " + msg_append);
   Serial1.flush();
   delay(100);
   if (perform_assert) {
     TEST_ASSERT_EQUAL_STRING(("Hello from Serial1 (UART1) >>> via loopback >>> Serial1 (UART1) " + msg_append).c_str(), recv_msg.c_str());
   }
-#elif SOC_UART_NUM == 3
+#elif SOC_UART_HP_NUM == 3
   Serial1.print("Hello from Serial1 (UART1) >>> to >>> Serial2 (UART2) " + msg_append);
   Serial1.flush();
   delay(100);
@@ -126,9 +126,9 @@ void transmit_and_check_msg(const String msg_append, bool perform_assert = true)
 void task_delayed_msg(void *pvParameters) {
   HardwareSerial *selected_serial;
 
-#if SOC_UART_NUM == 2
+#if SOC_UART_HP_NUM == 2
   selected_serial = &Serial;
-#elif SOC_UART_NUM == 3
+#elif SOC_UART_HP_NUM == 3
   selected_serial = &Serial1;
 #endif
 
@@ -143,14 +143,14 @@ void task_delayed_msg(void *pvParameters) {
 // This function is automatically called by unity before each test is run
 void setUp(void) {
   start_serial(115200);
-#if SOC_UART_NUM == 2
+#if SOC_UART_HP_NUM == 2
   log_d("Setup internal loop-back from and back to Serial1 (UART1) TX >> Serial1 (UART1) RX");
 
   Serial1.onReceive([]() {
     onReceive_cb(Serial1);
   });
   uart_internal_loopback(1, RX1);
-#elif SOC_UART_NUM == 3
+#elif SOC_UART_HP_NUM == 3
   log_d("Setup internal loop-back between Serial1 (UART1) <<--->> Serial2 (UART2)");
 
   Serial1.onReceive([]() {
@@ -180,11 +180,11 @@ void onReceive_cb(HardwareSerial &selected_serial) {
 
   if (&selected_serial == &Serial) {
     uart_num = 0;
-#if SOC_UART_NUM >= 2
+#if SOC_UART_HP_NUM >= 2
   } else if (&selected_serial == &Serial1) {
     uart_num = 1;
 #endif
-#if SOC_UART_NUM >= 3
+#if SOC_UART_HP_NUM >= 3
   } else if (&selected_serial == &Serial2) {
     uart_num = 2;
 #endif
@@ -225,7 +225,7 @@ void change_baudrate_test(void) {
   Serial1.updateBaudRate(9600);
   TEST_ASSERT_UINT_WITHIN(192, 9600, Serial1.baudRate());
 
-#if SOC_UART_NUM == 3
+#if SOC_UART_HP_NUM == 3
   Serial2.updateBaudRate(9600);
   TEST_ASSERT_UINT_WITHIN(192, 9600, Serial2.baudRate());
 #endif
@@ -239,7 +239,7 @@ void change_baudrate_test(void) {
   //Baudrate error should be within 2% of the target baudrate
   TEST_ASSERT_UINT_WITHIN(2304, 115200, Serial1.baudRate());
 
-#if SOC_UART_NUM == 3
+#if SOC_UART_HP_NUM == 3
   TEST_ASSERT_UINT_WITHIN(2304, 115200, Serial2.baudRate());
 #endif
 
@@ -419,20 +419,20 @@ void change_pins_test(void) {
 
   log_d("Disabling UART loopback");
 
-#if SOC_UART_NUM == 2
+#if SOC_UART_HP_NUM == 2
   esp_rom_gpio_connect_out_signal(SOC_RX0, SIG_GPIO_OUT_IDX, false, false);
-#elif SOC_UART_NUM == 3
+#elif SOC_UART_HP_NUM == 3
   esp_rom_gpio_connect_out_signal(RX1, SIG_GPIO_OUT_IDX, false, false);
   esp_rom_gpio_connect_out_signal(RX2, SIG_GPIO_OUT_IDX, false, false);
 #endif
 
   log_d("Swapping UART pins");
 
-#if SOC_UART_NUM == 2
+#if SOC_UART_HP_NUM == 2
   Serial1.setPins(NEW_RX1, NEW_TX1);
   TEST_ASSERT_EQUAL(NEW_RX1, uart_get_RxPin(1));
   TEST_ASSERT_EQUAL(NEW_TX1, uart_get_TxPin(1));
-#elif SOC_UART_NUM == 3
+#elif SOC_UART_HP_NUM == 3
   Serial1.setPins(RX2, TX2);
   Serial2.setPins(RX1, TX1);
   TEST_ASSERT_EQUAL(RX2, uart_get_RxPin(1));
@@ -445,9 +445,9 @@ void change_pins_test(void) {
 
   log_d("Re-enabling UART loopback");
 
-#if SOC_UART_NUM == 2
+#if SOC_UART_HP_NUM == 2
   uart_internal_loopback(1, NEW_RX1);
-#elif SOC_UART_NUM == 3
+#elif SOC_UART_HP_NUM == 3
   uart_internal_loopback(1, RX1);
   uart_internal_loopback(2, RX2);
 #endif
@@ -467,10 +467,10 @@ void auto_baudrate_test(void) {
 
   log_d("Stopping test serial. Using Serial2 for ESP32 and Serial1 for ESP32-S2.");
 
-#if SOC_UART_NUM == 2
+#if SOC_UART_HP_NUM == 2
   selected_serial = &Serial1;
   uart_internal_loopback(0, RX1);
-#elif SOC_UART_NUM == 3
+#elif SOC_UART_HP_NUM == 3
   selected_serial = &Serial2;
 #endif
 
@@ -485,7 +485,7 @@ void auto_baudrate_test(void) {
   selected_serial->begin(0);
   baudrate = selected_serial->baudRate();
 
-#if SOC_UART_NUM == 2
+#if SOC_UART_HP_NUM == 2
   Serial.end();
   Serial.begin(115200);
 #endif
@@ -504,7 +504,7 @@ void periman_test(void) {
 
   Wire.begin(RX1, TX1);
 
-#if SOC_UART_NUM == 3
+#if SOC_UART_HP_NUM == 3
   Wire1.begin(RX2, TX2);
 #endif
 
@@ -518,11 +518,11 @@ void periman_test(void) {
 
   Serial1.setPins(RX1, TX1);
 
-#if SOC_UART_NUM == 3
+#if SOC_UART_HP_NUM == 3
   Serial2.setPins(RX2, TX2);
   uart_internal_loopback(1, RX2);
   uart_internal_loopback(2, RX1);
-#elif SOC_UART_NUM == 2
+#elif SOC_UART_HP_NUM == 2
   uart_internal_loopback(1, RX1);
 #endif
 
@@ -565,19 +565,19 @@ void setup() {
   while (!Serial) {
     delay(10);
   }
-  log_d("SOC_UART_NUM = %d", SOC_UART_NUM);
+  log_d("SOC_UART_HP_NUM = %d", SOC_UART_HP_NUM);
 
   // Begin needs to be called before setting up the loopback because it creates the serial object
   start_serial(115200);
 
-#if SOC_UART_NUM == 2
+#if SOC_UART_HP_NUM == 2
   log_d("Setup internal loop-back from and back to Serial1 (UART1) TX >> Serial1 (UART1) RX");
 
   Serial1.onReceive([]() {
     onReceive_cb(Serial1);
   });
   uart_internal_loopback(1, RX1);
-#elif SOC_UART_NUM == 3
+#elif SOC_UART_HP_NUM == 3
   log_d("Setup internal loop-back between Serial1 (UART1) <<--->> Serial2 (UART2)");
 
   Serial1.onReceive([]() {