Reuse more existing error messages in ports/analog BUSIO

- Reuse more messages in locales/circuitpython.pot in BUSIO
- Remove UART write timeout
- Refine some error handling for SPI initialization

Signed-off-by: Brandon-Hurst <[email protected]>

Author: Brandon-Hurst

locale/circuitpython.pot

@@ -242,6 +242,7 @@ msgstr ""
 msgid "%q out of bounds"
 msgstr ""
 
+#: ports/analog/common-hal/busio/SPI.c
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
 #: ports/nordic/common-hal/pulseio/PulseIn.c
@@ -950,14 +951,6 @@ msgstr ""
 msgid "ECB only operates on 16 bytes at a time"
 msgstr ""
 
-#: ports/analog/common-hal/busio/UART.c
-msgid "ERR: Could not init ringbuffer\n"
-msgstr ""
-
-#: ports/analog/common-hal/busio/I2C.c
-msgid "ERROR during I2C Transaction\n"
-msgstr ""
-
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "ESP-IDF memory allocation failed"
@@ -1006,7 +999,7 @@ msgid ""
 "Failed to add service TXT record; non-string or bytes found in txt_records"
 msgstr ""
 
-#: shared-module/rgbmatrix/RGBMatrix.c
+#: ports/analog/common-hal/busio/UART.c shared-module/rgbmatrix/RGBMatrix.c
 msgid "Failed to allocate %q buffer"
 msgstr ""
 
@@ -1065,15 +1058,7 @@ msgid "Failed to release mutex, err 0x%04x"
 msgstr ""
 
 #: ports/analog/common-hal/busio/SPI.c
-msgid "Failed to set SPI Clock Mode\n"
-msgstr ""
-
-#: ports/analog/common-hal/busio/SPI.c
-msgid "Failed to set SPI Frame Size\n"
-msgstr ""
-
-#: ports/analog/common-hal/busio/SPI.c
-msgid "Failed to set SPI Frequency\n"
+msgid "Failed to set SPI Clock Mode"
 msgstr ""
 
 #: ports/zephyr-cp/common-hal/wifi/Radio.c
@@ -1374,6 +1359,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
+#: ports/analog/common-hal/busio/SPI.c
 #: ports/espressif/common-hal/espidf/__init__.c
 #: ports/nordic/common-hal/_bleio/__init__.c
 msgid "Invalid state"
@@ -2264,10 +2250,6 @@ msgstr ""
 msgid "UUID value is not str, int or byte buffer"
 msgstr ""
 
-#: ports/analog/common-hal/busio/UART.c
-msgid "Uart transaction timed out."
-msgstr ""
-
 #: ports/raspberrypi/common-hal/memorymap/AddressRange.c
 msgid "Unable to access unaligned IO register"
 msgstr ""

ports/analog/common-hal/busio/I2C.c

@@ -191,7 +191,7 @@ uint8_t common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr,
     };
     ret = MXC_I2C_MasterTransaction(&wr_req);
     if (ret) {
-        mp_raise_RuntimeError(MP_ERROR_TEXT("ERROR during I2C Transaction\n"));
+        return MP_EIO;
     }
 
     return 0;

ports/analog/common-hal/busio/SPI.c

@@ -177,17 +177,19 @@ bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
 
     ret = MXC_SPI_SetFrequency(self->spi_regs, baudrate);
     if (ret) {
-        mp_raise_ValueError(MP_ERROR_TEXT("Failed to set SPI Frequency\n"));
+        mp_raise_ValueError_varg(MP_ERROR_TEXT("%q out of range"), MP_QSTR_baudrate);
         return false;
     }
     ret = MXC_SPI_SetDataSize(self->spi_regs, bits);
-    if (ret) {
-        mp_raise_ValueError(MP_ERROR_TEXT("Failed to set SPI Frame Size\n"));
+    if (ret == E_BAD_PARAM) {
+        mp_raise_ValueError_varg(MP_ERROR_TEXT("%q out of range"), MP_QSTR_bits);
         return false;
+    } else if (ret == E_BAD_STATE) {
+        mp_raise_RuntimeError(MP_ERROR_TEXT("Invalid state"));
     }
     ret = MXC_SPI_SetMode(self->spi_regs, clk_mode);
     if (ret) {
-        mp_raise_ValueError(MP_ERROR_TEXT("Failed to set SPI Clock Mode\n"));
+        mp_raise_ValueError(MP_ERROR_TEXT("Failed to set SPI Clock Mode"));
         return false;
     }
     return true;
@@ -246,11 +248,6 @@ bool common_hal_busio_spi_read(busio_spi_obj_t *self,
     uint8_t write_value) {
 
     int ret = 0;
-    // uint8_t tx_buffer[len] = {0x0};
-
-    // for (int i = 0; i < len; i++) {
-    //     tx_buffer[i] = write_value;
-    // }
 
     mxc_spi_req_t rd_req = {
         .spi = self->spi_regs,

ports/analog/common-hal/busio/UART.c

@@ -24,11 +24,6 @@
  * THE SOFTWARE.
  */
 
-/** TODO:
- * - Fix readline issue
- *
-*/
-
 #if CIRCUITPY_BUSIO_UART
 
 #include "mpconfigport.h"
@@ -242,19 +237,19 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
         self->ringbuf = m_malloc_without_collect(receiver_buffer_size);
         if (!ringbuf_alloc(self->ringbuf, receiver_buffer_size)) {
             m_malloc_fail(receiver_buffer_size);
-            mp_raise_RuntimeError(MP_ERROR_TEXT("ERR: Could not init ringbuffer\n"));
+            mp_raise_RuntimeError_varg(MP_ERROR_TEXT("Failed to allocate %q buffer"),
+                MP_QSTR_UART);
         }
     } else {
         if (!(ringbuf_init(self->ringbuf, receiver_buffer, receiver_buffer_size))) {
-            mp_raise_RuntimeError(MP_ERROR_TEXT("ERR: Could not init ringbuffer\n"));
+            mp_raise_RuntimeError_varg(MP_ERROR_TEXT("Failed to allocate %q buffer"),
+                MP_QSTR_UART);
         }
-        ;
     }
 
     context = self;
 
     // Setup UART interrupt
-
     NVIC_ClearPendingIRQ(MXC_UART_GET_IRQ(self->uart_id));
     NVIC_DisableIRQ(MXC_UART_GET_IRQ(self->uart_id));
     NVIC_SetPriority(MXC_UART_GET_IRQ(self->uart_id), UART_PRIORITY);
@@ -351,7 +346,7 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self,
     }
     // Check for errors from the callback
     else if (uart_err != E_NO_ERROR) {
-        // todo: indicate error?
+        mp_raise_RuntimeError(MP_ERROR_TEXT("UART read error"));
         MXC_UART_AbortAsync(self->uart_regs);
     }
 
@@ -368,7 +363,6 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self,
 size_t common_hal_busio_uart_write(busio_uart_obj_t *self,
     const uint8_t *data, size_t len, int *errcode) {
     int err;
-    uint32_t start_time = 0;
     static size_t bytes_remaining;
 
     // Setup globals & status tracking
@@ -390,7 +384,6 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self,
     uart_wr_req.callback = (void *)uartCallback;
 
     // Start the transaction
-    start_time = supervisor_ticks_ms64();
     err = MXC_UART_TransactionAsync(&uart_wr_req);
     if (err != E_NO_ERROR) {
         *errcode = err;
@@ -399,27 +392,16 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self,
         mp_raise_ValueError(MP_ERROR_TEXT("All UART peripherals are in use"));
     }
 
-    // Wait for transaction completion or timeout
-    while ((uart_status[self->uart_id] != UART_FREE) &&
-           (supervisor_ticks_ms64() - start_time < (self->timeout * 1000))) {
-
+    // Wait for transaction completion
+    while (uart_status[self->uart_id] != UART_FREE) {
         // Call the handler and abort if errors
         uart_err = MXC_UART_AsyncHandler(self->uart_regs);
         if (uart_err != E_NO_ERROR) {
-            // todo: indicate error?
             MXC_UART_AbortAsync(self->uart_regs);
         }
     }
-
-    // If the timeout gets hit, abort and error out
-    if (uart_status[self->uart_id] != UART_FREE) {
-        MXC_UART_AbortAsync(self->uart_regs);
-        NVIC_DisableIRQ(MXC_UART_GET_IRQ(self->uart_id));
-        mp_raise_RuntimeError(MP_ERROR_TEXT("Uart transaction timed out."));
-    }
     // Check for errors from the callback
-    else if (uart_err != E_NO_ERROR) {
-        // todo: indicate error?
+    if (uart_err != E_NO_ERROR) {
         MXC_UART_AbortAsync(self->uart_regs);
     }