move uart tx. enable digitalio

tannewt · Dec 17, 2024 · e592db7 · e592db7
1 parent d9c05c5
commit e592db7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/boards/pca10056/mpconfigboard.h b/boards/pca10056/mpconfigboard.h
@@ -21,7 +21,7 @@
 #define DEFAULT_UART_BUS_RX         (&pin_P1_01)
 #define DEFAULT_UART_BUS_TX         (&pin_P1_02)
 
-#define CIRCUITPY_CONSOLE_UART_TX (&pin_P0_06)
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_P1_01)
 #define CIRCUITPY_CONSOLE_UART_RX (&pin_P0_08)
 
 // Flash operation mode is determined by MICROPY_QSPI_DATAn pin configuration.

diff --git a/ports/nordic/common-hal/digitalio/DigitalInOut.c b/ports/nordic/common-hal/digitalio/DigitalInOut.c
@@ -7,7 +7,7 @@
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "py/runtime.h"
 
-#include "nrf_gpio.h"
+#include <hal/nrf_gpio.h>
 
 void common_hal_digitalio_digitalinout_never_reset(
     digitalio_digitalinout_obj_t *self) {

diff --git a/prj.conf b/prj.conf
@@ -7,3 +7,6 @@ CONFIG_RING_BUFFER=y
 CONFIG_NRFX_UARTE0=y
 CONFIG_NRFX_UARTE1=y
 CONFIG_DYNAMIC_INTERRUPTS=y
+CONFIG_LOG_BACKEND_UART=y
+CONFIG_LOG_BACKEND_RTT=n
+CONFIG_LOG_BACKEND_SWO=n
diff --git a/tools/cpbuild/build_circuitpython.py b/tools/cpbuild/build_circuitpython.py
@@ -204,13 +204,15 @@ async def build_circuitpython():
         f"ports/{port}/common-hal/os/__init__.c",
         "supervisor/stub/misc.c",
         "shared/readline/readline.c",
+        "shared/runtime/context_manager_helpers.c",
         "shared/runtime/pyexec.c",
         "shared/runtime/interrupt_char.c",
         "shared/runtime/stdout_helpers.c",
         "shared/runtime/sys_stdio_mphal.c",
         "shared-bindings/board/__init__.c",
         "shared-bindings/supervisor/Runtime.c",
         "shared-bindings/microcontroller/Pin.c",
+        "shared-bindings/util.c",
         "shared-module/board/__init__.c",
         "extmod/vfs_reader.c",
         "extmod/vfs_blockdev.c",
@@ -227,6 +229,7 @@ async def build_circuitpython():
     # Load the toml settings
     kwargs = {}
     kwargs["busio"] = True
+    kwargs["digitalio"] = True
     with open(srcdir / "boards" / board / "mpconfigboard.toml", "rb") as f:
         mpconfigboard = tomllib.load(f)
     if usb_num_endpoint_pairs > 0: