Skip to content

Commit 25ece8f

Browse files
arturo182arturo182
committed
nrf: Rewrite the UART HAL using nrfx
1 parent c6a2a55 commit 25ece8f

File tree

11 files changed

+75
-362
lines changed

11 files changed

+75
-362
lines changed

‎ports/nrf/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ LIBS += -L $(dir $(LIBC_FILE_NAME)) -lc
9090
LIBS += -L $(dir $(LIBGCC_FILE_NAME)) -lgcc
9191

9292
SRC_HAL = $(addprefix hal/,\
93-
hal_uart.c \
9493
hal_time.c \
9594
hal_rng.c \
9695
)
9796

9897
SRC_NRFX = $(addprefix nrfx/,\
9998
drivers/src/nrfx_spim.c \
10099
drivers/src/nrfx_twim.c \
100+
drivers/src/nrfx_uart.c \
101101
)
102102

103103
SRC_C += \

‎ports/nrf/boards/feather52832/mpconfigboard.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#define MICROPY_HW_MCU_NAME "nRF52832"
2929
#define MICROPY_PY_SYS_PLATFORM "nRF52"
3030

31-
#define MICROPY_HW_UART1_RX (pin_P0_08)
32-
#define MICROPY_HW_UART1_TX (pin_P0_06)
33-
#define MICROPY_HW_UART1_HWFC (0)
31+
#define MICROPY_HW_UART_RX NRF_GPIO_PIN_MAP(0, 8)
32+
#define MICROPY_HW_UART_TX NRF_GPIO_PIN_MAP(0, 6)
33+
#define MICROPY_HW_UART_HWFC (0)
3434

3535
#define PORT_HEAP_SIZE (32 * 1024)
3636
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500

‎ports/nrf/boards/feather52840/mpconfigboard.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@
3030
#define MICROPY_HW_MCU_NAME "nRF52840"
3131
#define MICROPY_PY_SYS_PLATFORM "nRF52840-PDK"
3232

33-
#define MICROPY_HW_UART1_RX (pin_P0_08)
34-
#define MICROPY_HW_UART1_TX (pin_P0_06)
35-
#define MICROPY_HW_UART1_CTS (pin_P0_07)
36-
#define MICROPY_HW_UART1_RTS (pin_P0_05)
37-
#define MICROPY_HW_UART1_HWFC (1)
33+
#define MICROPY_HW_UART_RX NRF_GPIO_PIN_MAP(0, 8)
34+
#define MICROPY_HW_UART_TX NRF_GPIO_PIN_MAP(0, 6)
35+
#define MICROPY_HW_UART_HWFC (0)
3836

3937
#define PORT_HEAP_SIZE (128 * 1024)
4038
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500

‎ports/nrf/boards/pca10040/mpconfigboard.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@
2828
#define MICROPY_HW_MCU_NAME "nRF52832"
2929
#define MICROPY_PY_SYS_PLATFORM "nRF52-DK"
3030

31-
#define MICROPY_HW_UART1_RX (pin_P0_08)
32-
#define MICROPY_HW_UART1_TX (pin_P0_06)
33-
#define MICROPY_HW_UART1_CTS (pin_P0_07)
34-
#define MICROPY_HW_UART1_RTS (pin_P0_05)
35-
#define MICROPY_HW_UART1_HWFC (1)
31+
#define MICROPY_HW_UART_RX NRF_GPIO_PIN_MAP(0, 8)
32+
#define MICROPY_HW_UART_TX NRF_GPIO_PIN_MAP(0, 6)
33+
#define MICROPY_HW_UART_HWFC (0)
3634

3735
#define PORT_HEAP_SIZE (32 * 1024)
3836
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500

‎ports/nrf/boards/pca10056/mpconfigboard.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@
2828
#define MICROPY_HW_MCU_NAME "nRF52840"
2929
#define MICROPY_PY_SYS_PLATFORM "nRF52840-PDK"
3030

31-
#define MICROPY_HW_UART1_RX (pin_P0_08)
32-
#define MICROPY_HW_UART1_TX (pin_P0_06)
33-
#define MICROPY_HW_UART1_CTS (pin_P0_07)
34-
#define MICROPY_HW_UART1_RTS (pin_P0_05)
35-
#define MICROPY_HW_UART1_HWFC (1)
31+
#define MICROPY_HW_UART_RX NRF_GPIO_PIN_MAP(0, 8)
32+
#define MICROPY_HW_UART_TX NRF_GPIO_PIN_MAP(0, 6)
33+
#define MICROPY_HW_UART_HWFC (0)
3634

3735
#define PORT_HEAP_SIZE (128 * 1024)
3836
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500

‎ports/nrf/hal/hal_uart.c

Lines changed: 0 additions & 181 deletions
This file was deleted.

‎ports/nrf/hal/hal_uart.h

Lines changed: 0 additions & 113 deletions
This file was deleted.

0 commit comments

Comments
 (0)