mimxrt1011: UART: Add additional error checking

jepler · jepler · commit 71eee45a3779 · 2021-03-30T10:17:48.000-05:00
.. and make the 'invalid pin' messages standard. Closes adafruit#4502
diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c
@@ -153,6 +153,13 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
         mp_raise_ValueError(translate("Supply at least one UART pin"));
     }
 
+    if (rx && !self->rx) {
+        mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_RX);
+    }
+    if (tx && !self->tx) {
+        mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_TX);
+    }
+
     if (uart_taken) {
         mp_raise_ValueError(translate("Hardware in use, try alternative pins"));
     }
@@ -188,7 +195,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
             }
         }
         if (self->rts == NULL) {
-            mp_raise_ValueError(translate("Selected RTS pin not valid"));
+            mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_RTS);
         }
     }
 
@@ -202,16 +209,19 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
             }
         }
         if (self->cts == NULL) {
-            mp_raise_ValueError(translate("Selected CTS pin not valid"));
+            mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_CTS);
         }
     }
 
     if (self->rx) {
         self->uart = mcu_uart_banks[self->rx->bank_idx - 1];
     } else {
+        assert(self->rx);
         self->uart = mcu_uart_banks[self->tx->bank_idx - 1];
     }
 
+    assert(self->uart);
+
     if (self->rx) {
         config_periph_pin(self->rx);
     }

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,13 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,`
`153`	`153`	`mp_raise_ValueError(translate("Supply at least one UART pin"));`
`154`	`154`	`}`
`155`	`155`
	`156`	`+ if (rx && !self->rx) {`
	`157`	`+ mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_RX);`
	`158`	`+ }`
	`159`	`+ if (tx && !self->tx) {`
	`160`	`+ mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_TX);`
	`161`	`+ }`
	`162`	`+`
`156`	`163`	`if (uart_taken) {`
`157`	`164`	`mp_raise_ValueError(translate("Hardware in use, try alternative pins"));`
`158`	`165`	`}`
`@@ -188,7 +195,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,`
`188`	`195`	`}`
`189`	`196`	`}`
`190`	`197`	`if (self->rts == NULL) {`
`191`		`- mp_raise_ValueError(translate("Selected RTS pin not valid"));`
	`198`	`+ mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_RTS);`
`192`	`199`	`}`
`193`	`200`	`}`
`194`	`201`
`@@ -202,16 +209,19 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,`
`202`	`209`	`}`
`203`	`210`	`}`
`204`	`211`	`if (self->cts == NULL) {`
`205`		`- mp_raise_ValueError(translate("Selected CTS pin not valid"));`
	`212`	`+ mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_CTS);`
`206`	`213`	`}`
`207`	`214`	`}`
`208`	`215`
`209`	`216`	`if (self->rx) {`
`210`	`217`	`self->uart = mcu_uart_banks[self->rx->bank_idx - 1];`
`211`	`218`	`} else {`
	`219`	`+ assert(self->rx);`
`212`	`220`	`self->uart = mcu_uart_banks[self->tx->bank_idx - 1];`
`213`	`221`	`}`
`214`	`222`
	`223`	`+ assert(self->uart);`
	`224`	`+`
`215`	`225`	`if (self->rx) {`
`216`	`226`	`config_periph_pin(self->rx);`
`217`	`227`	`}`