From a3ffd086825c4593364e91052285ef31a81d6799 Mon Sep 17 00:00:00 2001 From: mrangen Date: Sun, 11 Jun 2023 18:08:26 -0600 Subject: [PATCH 01/12] Copied RP Pico Board Folder, Renamed raspberry_breadstick --- .../boards/raspberry_breadstick/board.c | 29 ++++++++++ .../raspberry_breadstick/mpconfigboard.h | 7 +++ .../raspberry_breadstick/mpconfigboard.mk | 12 ++++ .../pico-sdk-configboard.h | 1 + .../boards/raspberry_breadstick/pins.c | 56 +++++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 ports/raspberrypi/boards/raspberry_breadstick/board.c create mode 100644 ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/raspberry_breadstick/pins.c diff --git a/ports/raspberrypi/boards/raspberry_breadstick/board.c b/ports/raspberrypi/boards/raspberry_breadstick/board.c new file mode 100644 index 0000000000000..331653173ecd1 --- /dev/null +++ b/ports/raspberrypi/boards/raspberry_breadstick/board.c @@ -0,0 +1,29 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" + +// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h new file mode 100644 index 0000000000000..548af930badfa --- /dev/null +++ b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h @@ -0,0 +1,7 @@ +#define MICROPY_HW_BOARD_NAME "Raspberry Pi Pico" +#define MICROPY_HW_MCU_NAME "rp2040" + +#define MICROPY_HW_LED_STATUS (&pin_GPIO25) + +#define CIRCUITPY_BOARD_I2C (1) +#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO5, .sda = &pin_GPIO4}} diff --git a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk new file mode 100644 index 0000000000000..20607d50e41c6 --- /dev/null +++ b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk @@ -0,0 +1,12 @@ +USB_VID = 0x239A +USB_PID = 0x80F4 +USB_PRODUCT = "Pico" +USB_MANUFACTURER = "Raspberry Pi" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" + +CIRCUITPY__EVE = 1 +CIRCUITPY_PICODVI = 1 diff --git a/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h b/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h new file mode 100644 index 0000000000000..36da55d457197 --- /dev/null +++ b/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h @@ -0,0 +1 @@ +// Put board-specific pico-sdk definitions here. This file must exist. diff --git a/ports/raspberrypi/boards/raspberry_breadstick/pins.c b/ports/raspberrypi/boards/raspberry_breadstick/pins.c new file mode 100644 index 0000000000000..2d56b9375752b --- /dev/null +++ b/ports/raspberrypi/boards/raspberry_breadstick/pins.c @@ -0,0 +1,56 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, + + { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) }, + + { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) }, + + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) }, + + { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From e5c53159660585e7d72c8a185c13051641f72390 Mon Sep 17 00:00:00 2001 From: mrangen Date: Mon, 12 Jun 2023 22:07:49 -0600 Subject: [PATCH 02/12] changed board name to Raspberry Breadstick --- ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h index 548af930badfa..3ba3c154931ba 100644 --- a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h +++ b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h @@ -1,4 +1,4 @@ -#define MICROPY_HW_BOARD_NAME "Raspberry Pi Pico" +#define MICROPY_HW_BOARD_NAME "Raspberry Breadstick" #define MICROPY_HW_MCU_NAME "rp2040" #define MICROPY_HW_LED_STATUS (&pin_GPIO25) From 032cd4721cbffd980cdfbcd0f024c3f33981f607 Mon Sep 17 00:00:00 2001 From: mrangen Date: Mon, 12 Jun 2023 22:57:03 -0600 Subject: [PATCH 03/12] Added Frozen Modules LSM6DS and DotStar --- .../raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk index 20607d50e41c6..fb91124ad96d2 100644 --- a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk +++ b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk @@ -10,3 +10,7 @@ EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" CIRCUITPY__EVE = 1 CIRCUITPY_PICODVI = 1 + +# Include these Python libraries in firmware. +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LSM6DS/frozen_cpx +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar/frozen_cpx \ No newline at end of file From bfffc7106e5e35efddef20ab1837ac633ff1bcb0 Mon Sep 17 00:00:00 2001 From: mrangen Date: Wed, 14 Jun 2023 23:14:05 -0600 Subject: [PATCH 04/12] remove frozen mods --- .../raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk index fb91124ad96d2..056ff9c01778f 100644 --- a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk +++ b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk @@ -12,5 +12,5 @@ CIRCUITPY__EVE = 1 CIRCUITPY_PICODVI = 1 # Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LSM6DS/frozen_cpx -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar/frozen_cpx \ No newline at end of file +#FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LSM6DS/frozen_cpx +#FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar/frozen_cpx From 7d915db3fa11da179f76f83cb9a025b281d2fd86 Mon Sep 17 00:00:00 2001 From: mrangen Date: Mon, 19 Jun 2023 17:17:20 -0600 Subject: [PATCH 05/12] edited PID and VID info --- .../boards/raspberry_breadstick/mpconfigboard.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk index 056ff9c01778f..8916230cc26e2 100644 --- a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk +++ b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk @@ -1,7 +1,7 @@ -USB_VID = 0x239A -USB_PID = 0x80F4 -USB_PRODUCT = "Pico" -USB_MANUFACTURER = "Raspberry Pi" +USB_VID = 0x2E8A +USB_PID = 0x105E +USB_PRODUCT = "Raspberry Breadstick" +USB_MANUFACTURER = "J&R Creative Technologies Inc." CHIP_VARIANT = RP2040 CHIP_FAMILY = rp2 @@ -12,5 +12,5 @@ CIRCUITPY__EVE = 1 CIRCUITPY_PICODVI = 1 # Include these Python libraries in firmware. -#FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LSM6DS/frozen_cpx -#FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar/frozen_cpx +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LSM6DS/ +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar/ From 077490ab5f03b8e5dd8dfcd03c2b9cbce86c0aeb Mon Sep 17 00:00:00 2001 From: mrangen Date: Mon, 19 Jun 2023 17:45:02 -0600 Subject: [PATCH 06/12] cody test --- .../boards/raspberry_breadstick/pico-sdk-configboard.h | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h b/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h index 36da55d457197..43633542d987d 100644 --- a/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h +++ b/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h @@ -1 +1,2 @@ // Put board-specific pico-sdk definitions here. This file must exist. +// cody test From 9b5795ced87690c816fc4d8f5ce3a66982bb541b Mon Sep 17 00:00:00 2001 From: mrangen Date: Sat, 18 Nov 2023 12:47:49 -0700 Subject: [PATCH 07/12] test --- .../boards/raspberry_breadstick/pico-sdk-configboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h b/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h index 43633542d987d..6470aa6f1bd82 100644 --- a/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h +++ b/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h @@ -1,2 +1,2 @@ // Put board-specific pico-sdk definitions here. This file must exist. -// cody test +// cody test2 From 798ea18896984e546103539eb8d82f05d9115146 Mon Sep 17 00:00:00 2001 From: mrangen Date: Sat, 18 Nov 2023 23:00:02 -0700 Subject: [PATCH 08/12] board configured for Rev0.2 --- .../raspberry_breadstick/mpconfigboard.h | 16 ++- .../raspberry_breadstick/mpconfigboard.mk | 5 +- .../boards/raspberry_breadstick/pins.c | 101 ++++++++++-------- 3 files changed, 71 insertions(+), 51 deletions(-) diff --git a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h index 3ba3c154931ba..e0ea38048537a 100644 --- a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h +++ b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h @@ -1,7 +1,17 @@ #define MICROPY_HW_BOARD_NAME "Raspberry Breadstick" #define MICROPY_HW_MCU_NAME "rp2040" -#define MICROPY_HW_LED_STATUS (&pin_GPIO25) -#define CIRCUITPY_BOARD_I2C (1) -#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO5, .sda = &pin_GPIO4}} +#define MICROPY_HW_APA102_MOSI (&pin_GPIO17) +#define MICROPY_HW_APA102_SCK (&pin_GPIO16) +#define MICROPY_HW_APA102_COUNT (24) + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO23) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO22) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO10) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO11) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO8) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO21) +#define DEFAULT_UART_BUS_TX (&pin_GPIO20) diff --git a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk index 8916230cc26e2..0e1b4f564e5ed 100644 --- a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk +++ b/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk @@ -6,10 +6,9 @@ USB_MANUFACTURER = "J&R Creative Technologies Inc." CHIP_VARIANT = RP2040 CHIP_FAMILY = rp2 -EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" +EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ" -CIRCUITPY__EVE = 1 -CIRCUITPY_PICODVI = 1 +CIRCUITPY_BITBANG_APA102 = 1 # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LSM6DS/ diff --git a/ports/raspberrypi/boards/raspberry_breadstick/pins.c b/ports/raspberrypi/boards/raspberry_breadstick/pins.c index 2d56b9375752b..620ec7e903776 100644 --- a/ports/raspberrypi/boards/raspberry_breadstick/pins.c +++ b/ports/raspberrypi/boards/raspberry_breadstick/pins.c @@ -3,54 +3,65 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS - { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, - { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, - { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, - { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, - { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, - { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, - { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, - { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, - { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, - { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, - { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) }, - { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, - { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, - { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) }, - { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) }, - { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) }, - { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, - { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, - { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) }, - { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, - { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, - { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, - { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, - - { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_GPIO23) }, - { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) }, - - { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) }, - { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) }, - - { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) }, - { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) }, - - { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, - { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, - { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, - - { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, - { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_D1_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO27) }, { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, - { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, - { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, - { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_D2_A2), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO18) }, + + { MP_ROM_QSTR(MP_QSTR_D17_A17), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_A17), MP_ROM_PTR(&pin_GPIO29) }, + + { MP_ROM_QSTR(MP_QSTR_D18_A18), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A18), MP_ROM_PTR(&pin_GPIO28) }, + + { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_DOTSTAR_DATA), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_DOTSTAR_CLOCK), MP_ROM_PTR(&pin_GPIO16) }, + + // I2C pins + { MP_ROM_QSTR(MP_QSTR_IMU_SDA), MP_ROM_PTR(&pin_GPIO12) }, // I2C0-SDA //double check + { MP_ROM_QSTR(MP_QSTR_IMU_SCL), MP_ROM_PTR(&pin_GPIO13) }, // I2C0-SCL to imu + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO22) }, // I2C1-SDA + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO23) }, // I2C1-SCL + + // SPI pins + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) }, // SPI1-TX + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) }, // SPI1-SCK + { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO9) }, // SPI1-CSn --- double check + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) }, // SPI1-RX + + // UART pins + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO21) }, // UART1 + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO20) }, // UART1 + + + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, + - { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, - { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) }, - { MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) }, }; MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); From 1028c32fe420a340e3d1d5fa748daec1028a8e9d Mon Sep 17 00:00:00 2001 From: mrangen Date: Wed, 22 Nov 2023 21:10:37 -0700 Subject: [PATCH 09/12] edit board folder and name. --- .../{raspberry_breadstick => breadstick_raspberry}/board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 2 +- .../boards/breadstick_raspberry/pico-sdk-configboard.h | 4 ++++ .../{raspberry_breadstick => breadstick_raspberry}/pins.c | 4 +--- .../boards/raspberry_breadstick/pico-sdk-configboard.h | 2 -- 6 files changed, 6 insertions(+), 6 deletions(-) rename ports/raspberrypi/boards/{raspberry_breadstick => breadstick_raspberry}/board.c (100%) rename ports/raspberrypi/boards/{raspberry_breadstick => breadstick_raspberry}/mpconfigboard.h (100%) rename ports/raspberrypi/boards/{raspberry_breadstick => breadstick_raspberry}/mpconfigboard.mk (87%) create mode 100644 ports/raspberrypi/boards/breadstick_raspberry/pico-sdk-configboard.h rename ports/raspberrypi/boards/{raspberry_breadstick => breadstick_raspberry}/pins.c (99%) delete mode 100644 ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h diff --git a/ports/raspberrypi/boards/raspberry_breadstick/board.c b/ports/raspberrypi/boards/breadstick_raspberry/board.c similarity index 100% rename from ports/raspberrypi/boards/raspberry_breadstick/board.c rename to ports/raspberrypi/boards/breadstick_raspberry/board.c diff --git a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h b/ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.h similarity index 100% rename from ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.h rename to ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.h diff --git a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk b/ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk similarity index 87% rename from ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk rename to ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk index 0e1b4f564e5ed..475f4e6f59ed9 100644 --- a/ports/raspberrypi/boards/raspberry_breadstick/mpconfigboard.mk +++ b/ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk @@ -1,7 +1,7 @@ USB_VID = 0x2E8A USB_PID = 0x105E USB_PRODUCT = "Raspberry Breadstick" -USB_MANUFACTURER = "J&R Creative Technologies Inc." +USB_MANUFACTURER = "Breadstick Innovations" CHIP_VARIANT = RP2040 CHIP_FAMILY = rp2 diff --git a/ports/raspberrypi/boards/breadstick_raspberry/pico-sdk-configboard.h b/ports/raspberrypi/boards/breadstick_raspberry/pico-sdk-configboard.h new file mode 100644 index 0000000000000..a41131dd22b7e --- /dev/null +++ b/ports/raspberrypi/boards/breadstick_raspberry/pico-sdk-configboard.h @@ -0,0 +1,4 @@ +// Put board-specific pico-sdk definitions here. This file must exist. + +// Allow extra time for xosc to start. +#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 diff --git a/ports/raspberrypi/boards/raspberry_breadstick/pins.c b/ports/raspberrypi/boards/breadstick_raspberry/pins.c similarity index 99% rename from ports/raspberrypi/boards/raspberry_breadstick/pins.c rename to ports/raspberrypi/boards/breadstick_raspberry/pins.c index 620ec7e903776..643a444da44bf 100644 --- a/ports/raspberrypi/boards/raspberry_breadstick/pins.c +++ b/ports/raspberrypi/boards/breadstick_raspberry/pins.c @@ -40,7 +40,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_DOTSTAR_CLOCK), MP_ROM_PTR(&pin_GPIO16) }, // I2C pins - { MP_ROM_QSTR(MP_QSTR_IMU_SDA), MP_ROM_PTR(&pin_GPIO12) }, // I2C0-SDA //double check + { MP_ROM_QSTR(MP_QSTR_IMU_SDA), MP_ROM_PTR(&pin_GPIO12) }, // I2C0-SDA { MP_ROM_QSTR(MP_QSTR_IMU_SCL), MP_ROM_PTR(&pin_GPIO13) }, // I2C0-SCL to imu { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO22) }, // I2C1-SDA @@ -61,7 +61,5 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, - - }; MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h b/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h deleted file mode 100644 index 6470aa6f1bd82..0000000000000 --- a/ports/raspberrypi/boards/raspberry_breadstick/pico-sdk-configboard.h +++ /dev/null @@ -1,2 +0,0 @@ -// Put board-specific pico-sdk definitions here. This file must exist. -// cody test2 From 22f232b288603d3c649ad676b0204c9fadcde359 Mon Sep 17 00:00:00 2001 From: Michael Rangen <73085145+mrangen@users.noreply.github.com> Date: Sun, 26 Nov 2023 18:19:56 -0700 Subject: [PATCH 10/12] Update pins.c --- ports/raspberrypi/boards/breadstick_raspberry/pins.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/raspberrypi/boards/breadstick_raspberry/pins.c b/ports/raspberrypi/boards/breadstick_raspberry/pins.c index 643a444da44bf..1e152ac0816f1 100644 --- a/ports/raspberrypi/boards/breadstick_raspberry/pins.c +++ b/ports/raspberrypi/boards/breadstick_raspberry/pins.c @@ -39,9 +39,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO16) }, { MP_ROM_QSTR(MP_QSTR_DOTSTAR_CLOCK), MP_ROM_PTR(&pin_GPIO16) }, - // I2C pins + // I2C pins for IMU { MP_ROM_QSTR(MP_QSTR_IMU_SDA), MP_ROM_PTR(&pin_GPIO12) }, // I2C0-SDA - { MP_ROM_QSTR(MP_QSTR_IMU_SCL), MP_ROM_PTR(&pin_GPIO13) }, // I2C0-SCL to imu + { MP_ROM_QSTR(MP_QSTR_IMU_SCL), MP_ROM_PTR(&pin_GPIO13) }, // I2C0-SCL { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO22) }, // I2C1-SDA { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO23) }, // I2C1-SCL @@ -49,7 +49,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { // SPI pins { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) }, // SPI1-TX { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO10) }, // SPI1-SCK - { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO9) }, // SPI1-CSn --- double check + { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO9) }, // SPI1-CSn { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) }, // SPI1-RX // UART pins From 0d57fc4d8c78856711e8d963a0f019bc10add959 Mon Sep 17 00:00:00 2001 From: Michael Rangen <73085145+mrangen@users.noreply.github.com> Date: Sun, 26 Nov 2023 18:20:07 -0700 Subject: [PATCH 11/12] Update mpconfigboard.mk --- ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk b/ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk index 475f4e6f59ed9..a2609d24ce887 100644 --- a/ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk +++ b/ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk @@ -13,3 +13,5 @@ CIRCUITPY_BITBANG_APA102 = 1 # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LSM6DS/ FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar/ +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register/ +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FancyLED/ From 4413f21c170cbd8f8193d89d1941a4996171b074 Mon Sep 17 00:00:00 2001 From: Michael Rangen <73085145+mrangen@users.noreply.github.com> Date: Sun, 26 Nov 2023 18:51:03 -0700 Subject: [PATCH 12/12] Update mpconfigboard.mk commented out fancyLED lib --- ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk b/ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk index a2609d24ce887..1d7466daa1ee5 100644 --- a/ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk +++ b/ports/raspberrypi/boards/breadstick_raspberry/mpconfigboard.mk @@ -14,4 +14,4 @@ CIRCUITPY_BITBANG_APA102 = 1 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LSM6DS/ FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar/ FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register/ -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FancyLED/ +# FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FancyLED/