Merge pull request adafruit#9500 from tannewt/2350_uart11

dhalbert · web-flow · commit 54536a36021a · 2024-08-14T13:07:04.000-04:00
Support UART_AUX pin function
diff --git a/ports/raspberrypi/common-hal/busio/UART.c b/ports/raspberrypi/common-hal/busio/UART.c
@@ -46,7 +46,17 @@ static void pin_check(const uint8_t uart, const mcu_pin_obj_t *pin, const uint8_
     if (pin == NULL) {
         return;
     }
-    if (!(((pin->number % 4) == pin_type) && ((((pin->number + 4) / 8) % NUM_UARTS) == uart))) {
+    uint8_t pins_uart = (pin->number + 4) / 8 % NUM_UARTS;
+    if (pins_uart != uart) {
+        raise_ValueError_invalid_pins();
+    }
+    #ifdef PICO_RP2350
+    if ((pin_type == 0 && pin->number % 4 == 2) ||
+        (pin_type == 1 && pin->number % 4 == 3)) {
+        return;
+    }
+    #endif
+    if ((pin->number % 4) != pin_type) {
         raise_ValueError_invalid_pins();
     }
 }
@@ -56,7 +66,15 @@ static uint8_t pin_init(const uint8_t uart, const mcu_pin_obj_t *pin, const uint
         return NO_PIN;
     }
     claim_pin(pin);
-    gpio_set_function(pin->number, GPIO_FUNC_UART);
+    gpio_function_t function = GPIO_FUNC_UART;
+    #ifdef PICO_RP2350
+    if ((pin_type == 0 && pin->number % 4 == 2) ||
+        (pin_type == 1 && pin->number % 4 == 3)) {
+        function = GPIO_FUNC_UART_AUX;
+    }
+    #endif
+
+    gpio_set_function(pin->number, function);
     return pin->number;
 }
 
