Fix - RP2x Platform

Author: brentru

src/components/gps/hardware.cpp

@@ -357,7 +357,13 @@ bool GPSHardware::DetectMtkUart() {
 
   // Attempt to use Adafruit_GPS
   _ada_gps = new Adafruit_GPS(_hw_serial);
-  if (!_ada_gps->begin(_hw_serial->baudRate())) {
+  int baud_rate;
+  #if defined(ARDUINO_RASPBERRY_PI_PICO_W) || defined(ARDUINO_RASPBERRY_PI_PICO_2W)
+  baud_rate = 9600; // Pico SDK does not support getting baud rate from serial, default to 9600
+  #else
+  baud_rate = _hw_serial->baudRate();
+  #endif
+  if (!_ada_gps->begin(baud_rate)) {
     WS_DEBUG_PRINTLN("[gps] ERROR: Failed to initialize Mediatek!");
     return false;
   }

src/components/uart/hardware.cpp

@@ -126,8 +126,19 @@ bool UARTHardware::ConfigureSerial() {
     _baud_rate = _config.baud_rate;
 #endif // HAS_SW_SERIAL
   } else {
+    #ifdef ARDUINO_ARCH_RP2040
+    if (_config.uart_nbr == 1) {
+      _hwSerial = &Serial1;
+    } else if (_config.uart_nbr == 2) {
+      _hwSerial = &Serial2;
+    } else {
+      WS_DEBUG_PRINTLN("[uart] ERROR: Invalid UART number for ESP32!");
+      return false;
+    }
+    #else
     // Create a new HardwareSerial instance
     _hwSerial = new HardwareSerial(_config.uart_nbr);
+    #endif
     if (_hwSerial == nullptr) {
       WS_DEBUG_PRINTLN(
           "[uart] ERROR: Failed to allocate HardwareSerial instance!");
@@ -138,8 +149,7 @@ bool UARTHardware::ConfigureSerial() {
     _hwSerial->begin((unsigned long)_config.baud_rate, (uint32_t)cfg, rx_pin,
                      tx_pin, false, (unsigned long)_config.timeout);
 #elif ARDUINO_ARCH_RP2040
-    _hwSerial->setRx(rx_pin);
-    _hwSerial->setTx(tx_pin);
+    // Pins are already defined by the Serial1/Serial2 instances
     _hwSerial->begin((unsigned long)_config.baud_rate, (uint32_t)cfg);
 #else
     // ESP8266, SAMD, and other platforms