From ecb74aa65228019b4bd0dd9d72bc08a1ceff6d46 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 21:33:29 -0400 Subject: [PATCH 01/13] Remove CIRCUITPY_CONSOLE_UART_TX/RX --- ports/broadcom/mpconfigport.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/ports/broadcom/mpconfigport.h b/ports/broadcom/mpconfigport.h index fc3966fc71..e77725cca3 100644 --- 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 From 0913e3a148cba1a63ca0958d863c901114e5748a Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 21:34:45 -0400 Subject: [PATCH 02/13] Define CIRCUITPY_CONSOLE_UART_TX/RX --- ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h index a3e318bb13..c6c7cfe22c 100644 --- 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_GPIO14) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15) From 7708f19ec82e3c5a99aab8216456f4be33bd358d Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 21:36:01 -0400 Subject: [PATCH 03/13] Define CIRCUITPY_CONSOLE_UART_TX/RX --- ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h index 9acfb32626..b0ebc091de 100644 --- 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) From a892af8d771150a6c0bf0948ef76fa12e0603871 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 21:36:41 -0400 Subject: [PATCH 04/13] Define CIRCUITPY_CONSOLE_UART_TX/RX --- ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h index 2980b0f9a5..fa8eb19ab0 100644 --- 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) From 72c479efe690ba547713123719874c187c6e6d2b Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 21:37:31 -0400 Subject: [PATCH 05/13] Define CIRCUITPY_CONSOLE_UART_TX/RX --- ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h index fa8eb19ab0..521c8fda25 100644 --- a/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h +++ b/ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h @@ -5,5 +5,5 @@ #define MICROPY_HW_LED_STATUS (&pin_GPIO42) -#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14) -#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15) +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15) From fb4062d23fdb771f7a3b2bdf9ca7a8234b021dfc Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 21:38:16 -0400 Subject: [PATCH 06/13] Define CIRCUITPY_CONSOLE_UART_TX/RX --- ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h index c6c7cfe22c..6d81ddca10 100644 --- a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h +++ b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h @@ -5,5 +5,5 @@ #define MICROPY_HW_NEOPIXEL (&pin_GPIO12) -#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14) -#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15) +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15) From 29e0aba72fbb7de82e77200271a8f8b6cb88296e Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 21:39:03 -0400 Subject: [PATCH 07/13] Define CIRCUITPY_CONSOLE_UART_TX/RX --- ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h index b0ebc091de..832a0b887b 100644 --- a/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h +++ b/ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h @@ -5,5 +5,5 @@ #define MICROPY_HW_LED_STATUS (&pin_GPIO42) -#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14) -#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15) +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15) From 1d03d73c13ab33fdc7a9397fd72455a0b57590f0 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 21:39:51 -0400 Subject: [PATCH 08/13] Define CIRCUITPY_CONSOLE_UART_TX/RX --- ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h index 1141520e06..c1566e8fc0 100644 --- 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) From 1bdf9fca40e9dafbaf33a07009379459e9207fb3 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 21:40:31 -0400 Subject: [PATCH 09/13] Define CIRCUITPY_CONSOLE_UART_TX/RX --- ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h index 11011268ae..b5b1d8437f 100644 --- a/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h +++ b/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h @@ -2,3 +2,6 @@ #define DEFAULT_I2C_BUS_SCL (&pin_GPIO3) #define DEFAULT_I2C_BUS_SDA (&pin_GPIO2) + +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15) From f4eb6185984f5283444b5aae7ba082e083fc7774 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 21:42:41 -0400 Subject: [PATCH 10/13] Define CIRCUITPY_CONSOLE_UART_TX/RX --- ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h index 389868f882..4dc1372ae5 100644 --- 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) From 38a0ca324ee2b1ca99831d2d9075d52201c58d5e Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 21:48:10 -0400 Subject: [PATCH 11/13] Uses different pins for RX/TX --- ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h index 6d81ddca10..12a68201fa 100644 --- a/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h +++ b/ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h @@ -5,5 +5,5 @@ #define MICROPY_HW_NEOPIXEL (&pin_GPIO12) -#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14) -#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15) +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO4) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO5) From 28756936d56729331733a17a2f750969a8713ece Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 23:17:02 -0400 Subject: [PATCH 12/13] Add HW_LED_STATUS pin to Zero 2W board --- ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h b/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h index b5b1d8437f..e65bf5c163 100644 --- a/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h +++ b/ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h @@ -3,5 +3,7 @@ #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) From 14b604f48ccc92ae54ff8d61c758911d6a43ef0f Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Sat, 10 Sep 2022 23:18:25 -0400 Subject: [PATCH 13/13] Add LED pin definition to Zero 2W board --- ports/broadcom/boards/raspberrypi_zero2w/pins.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/broadcom/boards/raspberrypi_zero2w/pins.c b/ports/broadcom/boards/raspberrypi_zero2w/pins.c index bb6632b923..5e12613b3f 100644 --- 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)},