Merge pull request #8928 from tannewt/imx_fixes

jepler · web-flow · commit 294d563d04ca · 2024-02-16T10:51:01.000-06:00
Numerous iMX fixes and SDK update
diff --git a/ports/mimxrt10xx/common-hal/busio/I2C.c b/ports/mimxrt10xx/common-hal/busio/I2C.c
@@ -138,6 +138,10 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
                 continue;
             }
 
+            if (reserved_i2c[mcu_i2c_scl_list[j].bank_idx - 1]) {
+                continue;
+            }
+
             self->sda = &mcu_i2c_sda_list[i];
             self->scl = &mcu_i2c_scl_list[j];
 
@@ -151,6 +155,9 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
         self->i2c = mcu_i2c_banks[self->sda->bank_idx - 1];
     }
 
+
+    reserved_i2c[self->sda->bank_idx - 1] = true;
+
     config_periph_pin(self->sda);
     config_periph_pin(self->scl);
 
diff --git a/ports/mimxrt10xx/common-hal/busio/I2C.h b/ports/mimxrt10xx/common-hal/busio/I2C.h
@@ -25,8 +25,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_BUSIO_I2C_H
-#define MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_BUSIO_I2C_H
+#pragma once
 
 #include "common-hal/microcontroller/Pin.h"
 #include "fsl_common.h"
@@ -42,5 +41,3 @@ typedef struct {
 } busio_i2c_obj_t;
 
 void i2c_reset(void);
-
-#endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_BUSIO_I2C_H
diff --git a/ports/mimxrt10xx/common-hal/busio/SPI.h b/ports/mimxrt10xx/common-hal/busio/SPI.h
@@ -25,8 +25,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_BUSIO_SPI_H
-#define MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_BUSIO_SPI_H
+#pragma once
 
 #include "common-hal/microcontroller/Pin.h"
 #include "fsl_common.h"
@@ -44,5 +43,3 @@ typedef struct {
 } busio_spi_obj_t;
 
 void spi_reset(void);
-
-#endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_BUSIO_SPI_H
diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c
@@ -83,24 +83,6 @@ static void config_periph_pin(const mcu_periph_obj_t *periph) {
         | IOMUXC_SW_PAD_CTL_PAD_SRE(0));
 }
 
-STATIC void LPUART_UserCallback(LPUART_Type *base, lpuart_handle_t *handle, status_t status, void *user_data) {
-    busio_uart_obj_t *self = (busio_uart_obj_t *)user_data;
-
-    if (status == kStatus_LPUART_RxIdle) {
-        self->rx_ongoing = false;
-    }
-}
-
-void uart_reset(void) {
-    for (uint i = 0; i < MP_ARRAY_SIZE(mcu_uart_banks); i++) {
-        if (never_reset_uart[i]) {
-            continue;
-        }
-        reserved_uart[i] = false;
-        LPUART_Deinit(mcu_uart_banks[i]);
-    }
-}
-
 void common_hal_busio_uart_never_reset(busio_uart_obj_t *self) {
     never_reset_uart[self->index] = true;
     common_hal_never_reset_pin(self->tx);
@@ -348,6 +330,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
 
     if (self->rx != NULL) {
         if (receiver_buffer == NULL) {
+            // One byte is used internally so add one to make sure we have enough space.
+            receiver_buffer_size += 1;
             self->ringbuf = gc_alloc(receiver_buffer_size, false);
         } else {
             self->ringbuf = receiver_buffer;
@@ -359,7 +343,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
             m_malloc_fail(receiver_buffer_size);
         }
 
-        LPUART_TransferCreateHandle(self->uart, &self->handle, LPUART_UserCallback, self);
+        // Use the internal ring buffer implementation.
+        LPUART_TransferCreateHandle(self->uart, &self->handle, NULL, NULL);
         // Pass actual allocated size; the LPUART routines are cognizant that
         // the capacity is one less than the size.
         LPUART_TransferStartRingBuffer(self->uart, &self->handle, self->ringbuf, receiver_buffer_size);
@@ -378,12 +363,13 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
         return;
     }
 
-    reserved_uart[self->index] = false;
-    never_reset_uart[self->index] = false;
-
+    LPUART_TransferStopRingBuffer(self->uart, &self->handle);
     LPUART_Deinit(self->uart);
     gc_free(self->ringbuf);
 
+    reserved_uart[self->index] = false;
+    never_reset_uart[self->index] = false;
+
     common_hal_reset_pin(self->rx);
     common_hal_reset_pin(self->tx);
     common_hal_reset_pin(self->cts);
@@ -395,7 +381,6 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
     self->cts = NULL;
     self->rts = NULL;
     self->rs485_dir = NULL;
-
 }
 
 // Read characters.
@@ -409,18 +394,24 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t
         return 0;
     }
 
-    lpuart_transfer_t xfer = {
-        .data = data,
-        .dataSize = len,
-    };
-
-    self->rx_ongoing = true;
-    LPUART_TransferReceiveNonBlocking(self->uart, &self->handle, &xfer, NULL);
-
+    size_t received = 0;
     uint64_t start_ticks = supervisor_ticks_ms64();
-
     // Wait for all bytes received or timeout
-    while (self->rx_ongoing && (supervisor_ticks_ms64() - start_ticks < self->timeout_ms)) {
+    while (received < len && (supervisor_ticks_ms64() - start_ticks < self->timeout_ms)) {
+        lpuart_transfer_t xfer = {
+            .data = data + received
+        };
+        size_t remaining = len - received;
+        xfer.dataSize = MIN(remaining, LPUART_TransferGetRxRingBufferLength(self->uart, &self->handle));
+        // Only request as much as has already been received. Otherwise, we need to deal with
+        // callbacks.
+        size_t additional_read = 0;
+        LPUART_TransferReceiveNonBlocking(self->uart, &self->handle, &xfer, &additional_read);
+        received += additional_read;
+        // Break early when we're done to skip background tasks.
+        if (received == len) {
+            break;
+        }
         RUN_BACKGROUND_TASKS;
 
         // Allow user to break out of a timeout with a KeyboardInterrupt.
@@ -429,30 +420,12 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t
         }
     }
 
-    // if we timed out, stop the transfer
-    if (self->rx_ongoing) {
-        uint32_t recvd = 0;
-        LPUART_TransferGetReceiveCount(self->uart, &self->handle, &recvd);
-        LPUART_TransferAbortReceive(self->uart, &self->handle);
-        if (recvd == 0) {
-            *errcode = EAGAIN;
-            return MP_STREAM_ERROR;
-        }
-        return recvd;
-    }
-
-    // No data left, we got it all
-    if (self->handle.rxData == NULL) {
-        return len;
+    if (received == 0) {
+        *errcode = EAGAIN;
+        return MP_STREAM_ERROR;
     }
 
-    // The only place we can reliably tell how many bytes have been received is from the current
-    // wp in the handle (because the abort nukes rxDataSize, and reading it before abort is a race.)
-    if (self->handle.rxData > data) {
-        return self->handle.rxData - data;
-    } else {
-        return len;
-    }
+    return received;
 }
 
 // Write characters.
diff --git a/ports/mimxrt10xx/common-hal/busio/UART.h b/ports/mimxrt10xx/common-hal/busio/UART.h
@@ -25,8 +25,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_BUSIO_UART_H
-#define MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_BUSIO_UART_H
+#pragma once
 
 #include "common-hal/microcontroller/Pin.h"
 
@@ -43,7 +42,6 @@ typedef struct {
     uint8_t *ringbuf;
     uint32_t baudrate;
     uint32_t timeout_ms;
-    bool rx_ongoing;
     uint8_t character_bits;
     uint8_t index;
     const mcu_pin_obj_t *rx;
@@ -54,6 +52,3 @@ typedef struct {
     bool rs485_invert;
 
 } busio_uart_obj_t;
-
-void uart_reset(void);
-#endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_BUSIO_UART_H
diff --git a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.h b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.h
@@ -25,8 +25,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
-#define MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
+#pragma once
 
 #include "common-hal/microcontroller/Pin.h"
 #include "shared-bindings/digitalio/Pull.h"
@@ -41,5 +40,3 @@ typedef struct {
 } digitalio_digitalinout_obj_t;
 
 void pin_config(const mcu_pin_obj_t *pin, bool open_drain, digitalio_pull_t pull);
-
-#endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c
@@ -29,6 +29,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
+#include "sdk/drivers/igpio/fsl_gpio.h"
+
 #include "py/gc.h"
 
 STATIC bool claimed_pins[PAD_COUNT];
@@ -91,6 +93,11 @@ void common_hal_reset_pin(const mcu_pin_obj_t *pin) {
     never_reset_pins[pin->mux_idx] = false;
     claimed_pins[pin->mux_idx] = false;
 
+    // Make sure this pin's GPIO is set to input. Otherwise, output values could interfere
+    // with the ADC.
+    const gpio_pin_config_t config = { kGPIO_DigitalInput, 0, kGPIO_NoIntmode };
+    GPIO_PinInit(pin->gpio, pin->number, &config);
+
     // This should never be true, but protect against it anyway.
     if (pin->mux_reg == 0) {
         return;
diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
@@ -213,7 +213,6 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
 
         /*
          * pwmConfig.enableDebugMode = false;
-         * pwmConfig.enableWait = false;
          * pwmConfig.reloadSelect = kPWM_LocalReload;
          * pwmConfig.faultFilterCount = 0;
          * pwmConfig.faultFilterPeriod = 0;
@@ -228,7 +227,6 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t *self,
         PWM_GetDefaultConfig(&pwmConfig);
 
         pwmConfig.reloadLogic = kPWM_ReloadPwmFullCycle;
-        pwmConfig.enableWait = true;
         pwmConfig.enableDebugMode = true;
 
         pwmConfig.prescale = self->prescaler;
diff --git a/ports/mimxrt10xx/sdk b/ports/mimxrt10xx/sdk
@@ -1 +1 @@
-Subproject commit 9990f264f98430f6d885041ab0f24224d68f4958
+Subproject commit f6c93eeb2372410019006fbf16a667ed79e44d86
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
@@ -43,6 +43,7 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/pwmio/PWMOut.h"
 #include "common-hal/rtc/RTC.h"
+#include "common-hal/busio/I2C.h"
 #include "common-hal/busio/SPI.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
@@ -447,6 +448,7 @@ safe_mode_t port_init(void) {
 
 void reset_port(void) {
     #if CIRCUITPY_BUSIO
+    i2c_reset();
     spi_reset();
     #endif
 
diff --git a/shared-bindings/busio/I2C.h b/shared-bindings/busio/I2C.h
@@ -24,15 +24,7 @@
  * THE SOFTWARE.
  */
 
-// Machine is the HAL for low-level, hardware accelerated functions. It is not
-// meant to simplify APIs, its only meant to unify them so that other modules
-// do not require port specific logic.
-//
-// This file includes externs for all functions a port should implement to
-// support the machine module.
-
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_H
+#pragma once
 
 #include "py/obj.h"
 
@@ -74,5 +66,3 @@ uint8_t common_hal_busio_i2c_write_read(busio_i2c_obj_t *self, uint16_t address,
 
 // This is used by the supervisor to claim I2C devices indefinitely.
 extern void common_hal_busio_i2c_never_reset(busio_i2c_obj_t *self);
-
-#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_H
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
@@ -155,6 +155,8 @@ STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, si
 
     uint8_t bits = (uint8_t)mp_arg_validate_int_range(args[ARG_bits].u_int, 5, 9, MP_QSTR_bits);
 
+    uint16_t buffer_size = (uint16_t)mp_arg_validate_int_range(args[ARG_receiver_buffer_size].u_int, 1, 0xffff, MP_QSTR_receiver_buffer_size);
+
     busio_uart_parity_t parity = BUSIO_UART_PARITY_NONE;
     if (args[ARG_parity].u_obj == MP_OBJ_FROM_PTR(&busio_uart_parity_even_obj)) {
         parity = BUSIO_UART_PARITY_EVEN;
@@ -174,7 +176,7 @@ STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, si
 
     common_hal_busio_uart_construct(self, tx, rx, rts, cts, rs485_dir, rs485_invert,
         args[ARG_baudrate].u_int, bits, parity, stop, timeout,
-        args[ARG_receiver_buffer_size].u_int, NULL, false);
+        buffer_size, NULL, false);
     return (mp_obj_t)self;
     #else
     mp_raise_NotImplementedError(NULL);
