Skip to content

Commit e592db7

Browse files
committed
move uart tx. enable digitalio
1 parent d9c05c5 commit e592db7

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

boards/pca10056/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#define DEFAULT_UART_BUS_RX (&pin_P1_01)
2222
#define DEFAULT_UART_BUS_TX (&pin_P1_02)
2323

24-
#define CIRCUITPY_CONSOLE_UART_TX (&pin_P0_06)
24+
#define CIRCUITPY_CONSOLE_UART_TX (&pin_P1_01)
2525
#define CIRCUITPY_CONSOLE_UART_RX (&pin_P0_08)
2626

2727
// Flash operation mode is determined by MICROPY_QSPI_DATAn pin configuration.

ports/nordic/common-hal/digitalio/DigitalInOut.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "shared-bindings/digitalio/DigitalInOut.h"
88
#include "py/runtime.h"
99

10-
#include "nrf_gpio.h"
10+
#include <hal/nrf_gpio.h>
1111

1212
void common_hal_digitalio_digitalinout_never_reset(
1313
digitalio_digitalinout_obj_t *self) {

prj.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ CONFIG_RING_BUFFER=y
77
CONFIG_NRFX_UARTE0=y
88
CONFIG_NRFX_UARTE1=y
99
CONFIG_DYNAMIC_INTERRUPTS=y
10+
CONFIG_LOG_BACKEND_UART=y
11+
CONFIG_LOG_BACKEND_RTT=n
12+
CONFIG_LOG_BACKEND_SWO=n

tools/cpbuild/build_circuitpython.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,15 @@ async def build_circuitpython():
204204
f"ports/{port}/common-hal/os/__init__.c",
205205
"supervisor/stub/misc.c",
206206
"shared/readline/readline.c",
207+
"shared/runtime/context_manager_helpers.c",
207208
"shared/runtime/pyexec.c",
208209
"shared/runtime/interrupt_char.c",
209210
"shared/runtime/stdout_helpers.c",
210211
"shared/runtime/sys_stdio_mphal.c",
211212
"shared-bindings/board/__init__.c",
212213
"shared-bindings/supervisor/Runtime.c",
213214
"shared-bindings/microcontroller/Pin.c",
215+
"shared-bindings/util.c",
214216
"shared-module/board/__init__.c",
215217
"extmod/vfs_reader.c",
216218
"extmod/vfs_blockdev.c",
@@ -227,6 +229,7 @@ async def build_circuitpython():
227229
# Load the toml settings
228230
kwargs = {}
229231
kwargs["busio"] = True
232+
kwargs["digitalio"] = True
230233
with open(srcdir / "boards" / board / "mpconfigboard.toml", "rb") as f:
231234
mpconfigboard = tomllib.load(f)
232235
if usb_num_endpoint_pairs > 0:

0 commit comments

Comments
 (0)