Merge pull request #6887 from RetiredWizard/Broadcom-UART

dhalbert · web-flow · commit d2f28eb98051 · 2022-09-13T14:35:16.000-04:00
Enable CIRCUITPY_CONSOLE_UART by default on Broadcom boards
diff --git a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h
@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_NEOPIXEL         (&pin_GPIO12)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO4)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO5)
diff --git a/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h
@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO42)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)
diff --git a/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h
@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO42)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)
diff --git a/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h
@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO47)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)
diff --git a/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h
@@ -2,3 +2,8 @@
 
 #define DEFAULT_I2C_BUS_SCL         (&pin_GPIO3)
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
+
+#define MICROPY_HW_LED_STATUS       (&pin_GPIO29)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)
diff --git a/ports/broadcom/boards/raspberrypi_zero2w/pins.c b/ports/broadcom/boards/raspberrypi_zero2w/pins.c
@@ -55,6 +55,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
     { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO29) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
diff --git a/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h
@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO47)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)
diff --git a/ports/broadcom/mpconfigport.h b/ports/broadcom/mpconfigport.h
@@ -60,7 +60,4 @@
 #define MICROPY_PORT_ROOT_POINTERS \
     CIRCUITPY_COMMON_ROOT_POINTERS
 
-#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
-#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)
-
 #endif  // __INCLUDED_MPCONFIGPORT_H
