Skip to content

Commit 4f2a10b

Browse files
iabdalkaderdpgeorge
authored andcommitted
rp2/machine_uart: Allow overriding default machine UART pins.
1 parent 8599f7a commit 4f2a10b

File tree

1 file changed

+21
-10
lines changed

1 file changed

+21
-10
lines changed

ports/rp2/machine_uart.c

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,23 @@
3838
#define DEFAULT_UART_BAUDRATE (115200)
3939
#define DEFAULT_UART_BITS (8)
4040
#define DEFAULT_UART_STOP (1)
41-
#define DEFAULT_UART0_TX (0)
42-
#define DEFAULT_UART0_RX (1)
43-
#define DEFAULT_UART0_CTS (2)
44-
#define DEFAULT_UART0_RTS (3)
45-
#define DEFAULT_UART1_TX (4)
46-
#define DEFAULT_UART1_RX (5)
47-
#define DEFAULT_UART1_CTS (6)
48-
#define DEFAULT_UART1_RTS (7)
41+
42+
// UART 0 default pins
43+
#if !defined(MICROPY_HW_UART0_TX)
44+
#define MICROPY_HW_UART0_TX (0)
45+
#define MICROPY_HW_UART0_RX (1)
46+
#define MICROPY_HW_UART0_CTS (2)
47+
#define MICROPY_HW_UART0_RTS (3)
48+
#endif
49+
50+
// UART 1 default pins
51+
#if !defined(MICROPY_HW_UART1_TX)
52+
#define MICROPY_HW_UART1_TX (4)
53+
#define MICROPY_HW_UART1_RX (5)
54+
#define MICROPY_HW_UART1_CTS (6)
55+
#define MICROPY_HW_UART1_RTS (7)
56+
#endif
57+
4958
#define DEFAULT_BUFFER_SIZE (256)
5059
#define MIN_BUFFER_SIZE (32)
5160
#define MAX_BUFFER_SIZE (32766)
@@ -87,9 +96,11 @@ typedef struct _machine_uart_obj_t {
8796

8897
STATIC machine_uart_obj_t machine_uart_obj[] = {
8998
{{&machine_uart_type}, uart0, 0, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP,
90-
DEFAULT_UART0_TX, DEFAULT_UART0_RX, DEFAULT_UART0_CTS, DEFAULT_UART0_RTS, 0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
99+
MICROPY_HW_UART0_TX, MICROPY_HW_UART0_RX, MICROPY_HW_UART0_CTS, MICROPY_HW_UART0_RTS,
100+
0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
91101
{{&machine_uart_type}, uart1, 1, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP,
92-
DEFAULT_UART1_TX, DEFAULT_UART1_RX, DEFAULT_UART1_CTS, DEFAULT_UART1_RTS, 0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
102+
MICROPY_HW_UART1_TX, MICROPY_HW_UART1_RX, MICROPY_HW_UART1_CTS, MICROPY_HW_UART1_RTS,
103+
0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
93104
};
94105

95106
STATIC const char *_parity_name[] = {"None", "0", "1"};

0 commit comments

Comments
 (0)