From 0567d069369a1dfa47910c55ad05d7dbe512c43c Mon Sep 17 00:00:00 2001 From: mintakka Date: Mon, 15 Mar 2021 10:27:21 -0400 Subject: [PATCH 1/8] added board configuration for Sparkfun ThingPlus RP2040 --- .../boards/sparkfun_thingplus/board.c | 40 +++++++++++++++++++ .../boards/sparkfun_thingplus/mpconfigboard.h | 17 ++++++++ .../sparkfun_thingplus/mpconfigboard.mk | 9 +++++ .../boards/sparkfun_thingplus/pins.c | 37 +++++++++++++++++ 4 files changed, 103 insertions(+) create mode 100644 ports/raspberrypi/boards/sparkfun_thingplus/board.c create mode 100644 ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/sparkfun_thingplus/pins.c diff --git a/ports/raspberrypi/boards/sparkfun_thingplus/board.c b/ports/raspberrypi/boards/sparkfun_thingplus/board.c new file mode 100644 index 0000000000..c4021a83e9 --- /dev/null +++ b/ports/raspberrypi/boards/sparkfun_thingplus/board.c @@ -0,0 +1,40 @@ +/* + * 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" + +#include "shared-bindings/microcontroller/Pin.h" +#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} diff --git a/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h b/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h new file mode 100644 index 0000000000..2c229e3898 --- /dev/null +++ b/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h @@ -0,0 +1,17 @@ +#define MICROPY_HW_BOARD_NAME "Sparkfun ThingPlus RP2040" +#define MICROPY_HW_MCU_NAME "rp2040" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO8) + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO7) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO6) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO14) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO15) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO12) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO1) +#define DEFAULT_UART_BUS_TX (&pin_GPIO0) + +// Flash chip is GD25Q64 connected over QSPI +#define TOTAL_FLASH_SIZE (16 * 1024 * 1024) diff --git a/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk b/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk new file mode 100644 index 0000000000..cb9468167a --- /dev/null +++ b/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk @@ -0,0 +1,9 @@ +USB_VID = 0x239A +USB_PID = 0x80F2 +USB_PRODUCT = "ThingPlus RP2040" +USB_MANUFACTURER = "Sparkfun" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +INTERNAL_FLASH_FILESYSTEM = 1 diff --git a/ports/raspberrypi/boards/sparkfun_thingplus/pins.c b/ports/raspberrypi/boards/sparkfun_thingplus/pins.c new file mode 100644 index 0000000000..8f63a9bdf2 --- /dev/null +++ b/ports/raspberrypi/boards/sparkfun_thingplus/pins.c @@ -0,0 +1,37 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_global_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + { 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_D24), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO2) }, + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO9)}, + + { 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_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table); From 30a74b3d922a8a9e944595a9572847c6b0fa8586 Mon Sep 17 00:00:00 2001 From: mintakka Date: Mon, 15 Mar 2021 21:07:24 -0400 Subject: [PATCH 2/8] Update ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk Co-authored-by: Scott Shawcroft --- ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk b/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk index cb9468167a..fc6c37dc3b 100644 --- a/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk +++ b/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk @@ -1,5 +1,5 @@ -USB_VID = 0x239A -USB_PID = 0x80F2 +USB_VID = 0x1B4F +USB_PID = 0x0025 USB_PRODUCT = "ThingPlus RP2040" USB_MANUFACTURER = "Sparkfun" From 288415f86760cf84d71c8ddd15327790b1b51a2f Mon Sep 17 00:00:00 2001 From: mintakka Date: Mon, 15 Mar 2021 21:07:31 -0400 Subject: [PATCH 3/8] Update ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h Co-authored-by: Scott Shawcroft --- ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h b/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h index 2c229e3898..82327c5d93 100644 --- a/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h +++ b/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h @@ -13,5 +13,5 @@ #define DEFAULT_UART_BUS_RX (&pin_GPIO1) #define DEFAULT_UART_BUS_TX (&pin_GPIO0) -// Flash chip is GD25Q64 connected over QSPI +// Flash chip is GD25Q128 connected over QSPI #define TOTAL_FLASH_SIZE (16 * 1024 * 1024) From 49baa94446a8cb6dc3f946b921fd351372e4f681 Mon Sep 17 00:00:00 2001 From: mintakka Date: Mon, 15 Mar 2021 23:00:24 -0400 Subject: [PATCH 4/8] added sparkfun_thingplus_rp2040 to .github/workflows/boards.yml and renamed board folder to include chip --- .github/workflows/build.yml | 1 + .../{sparkfun_thingplus => sparkfun_thingplus_rp2040}/board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../{sparkfun_thingplus => sparkfun_thingplus_rp2040}/pins.c | 0 5 files changed, 1 insertion(+) rename ports/raspberrypi/boards/{sparkfun_thingplus => sparkfun_thingplus_rp2040}/board.c (100%) rename ports/raspberrypi/boards/{sparkfun_thingplus => sparkfun_thingplus_rp2040}/mpconfigboard.h (100%) rename ports/raspberrypi/boards/{sparkfun_thingplus => sparkfun_thingplus_rp2040}/mpconfigboard.mk (100%) rename ports/raspberrypi/boards/{sparkfun_thingplus => sparkfun_thingplus_rp2040}/pins.c (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f65618b40d..9044fb18d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -322,6 +322,7 @@ jobs: - "sparkfun_samd21_dev" - "sparkfun_samd21_mini" - "sparkfun_samd51_thing_plus" + - "sparkfun_thingplus_rp2040" - "spresense" - "stackrduino_m0_pro" - "stm32f411ce_blackpill" diff --git a/ports/raspberrypi/boards/sparkfun_thingplus/board.c b/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/board.c similarity index 100% rename from ports/raspberrypi/boards/sparkfun_thingplus/board.c rename to ports/raspberrypi/boards/sparkfun_thingplus_rp2040/board.c diff --git a/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h b/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.h similarity index 100% rename from ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.h rename to ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.h diff --git a/ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk b/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.mk similarity index 100% rename from ports/raspberrypi/boards/sparkfun_thingplus/mpconfigboard.mk rename to ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.mk diff --git a/ports/raspberrypi/boards/sparkfun_thingplus/pins.c b/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/pins.c similarity index 100% rename from ports/raspberrypi/boards/sparkfun_thingplus/pins.c rename to ports/raspberrypi/boards/sparkfun_thingplus_rp2040/pins.c From cae3397ea09dd85b83f7d2b9f52b7ed27198c2be Mon Sep 17 00:00:00 2001 From: mintakka Date: Tue, 16 Mar 2021 13:47:10 -0400 Subject: [PATCH 5/8] Update .github/workflows/build.yml Co-authored-by: Scott Shawcroft --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9044fb18d1..1adc141c8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -322,7 +322,7 @@ jobs: - "sparkfun_samd21_dev" - "sparkfun_samd21_mini" - "sparkfun_samd51_thing_plus" - - "sparkfun_thingplus_rp2040" + - "sparkfun_thing_plus_rp2040" - "spresense" - "stackrduino_m0_pro" - "stm32f411ce_blackpill" From 3d15877639c70316b6f085b40a8f49ac56da3b5c Mon Sep 17 00:00:00 2001 From: mintakka Date: Tue, 16 Mar 2021 13:47:21 -0400 Subject: [PATCH 6/8] Update ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.mk Co-authored-by: Scott Shawcroft --- .../boards/sparkfun_thingplus_rp2040/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.mk index fc6c37dc3b..aaa26dc744 100644 --- a/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.mk +++ b/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.mk @@ -1,7 +1,7 @@ USB_VID = 0x1B4F USB_PID = 0x0025 USB_PRODUCT = "ThingPlus RP2040" -USB_MANUFACTURER = "Sparkfun" +USB_MANUFACTURER = "SparkFun" CHIP_VARIANT = RP2040 CHIP_FAMILY = rp2 From b5333f2bdf58f8af13167ea172e366bd5c78fa26 Mon Sep 17 00:00:00 2001 From: mintakka Date: Tue, 16 Mar 2021 13:47:33 -0400 Subject: [PATCH 7/8] Update ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.h Co-authored-by: Scott Shawcroft --- .../boards/sparkfun_thingplus_rp2040/mpconfigboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.h b/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.h index 82327c5d93..564e41a651 100644 --- a/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.h +++ b/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.h @@ -1,4 +1,4 @@ -#define MICROPY_HW_BOARD_NAME "Sparkfun ThingPlus RP2040" +#define MICROPY_HW_BOARD_NAME "SparkFun Thing Plus - RP2040" #define MICROPY_HW_MCU_NAME "rp2040" #define MICROPY_HW_NEOPIXEL (&pin_GPIO8) From 337727ba0ce1c31bb334c34fbd2b74f2447a2b62 Mon Sep 17 00:00:00 2001 From: mintakka Date: Tue, 16 Mar 2021 21:10:10 -0400 Subject: [PATCH 8/8] renamed board folder to match board name in boards.yml --- .../board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 2 +- .../pins.c | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename ports/raspberrypi/boards/{sparkfun_thingplus_rp2040 => sparkfun_thing_plus_rp2040}/board.c (100%) rename ports/raspberrypi/boards/{sparkfun_thingplus_rp2040 => sparkfun_thing_plus_rp2040}/mpconfigboard.h (100%) rename ports/raspberrypi/boards/{sparkfun_thingplus_rp2040 => sparkfun_thing_plus_rp2040}/mpconfigboard.mk (80%) rename ports/raspberrypi/boards/{sparkfun_thingplus_rp2040 => sparkfun_thing_plus_rp2040}/pins.c (100%) diff --git a/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/board.c b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c similarity index 100% rename from ports/raspberrypi/boards/sparkfun_thingplus_rp2040/board.c rename to ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/board.c diff --git a/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.h b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/mpconfigboard.h similarity index 100% rename from ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.h rename to ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/mpconfigboard.h diff --git a/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/mpconfigboard.mk similarity index 80% rename from ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.mk rename to ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/mpconfigboard.mk index aaa26dc744..f7369ab37e 100644 --- a/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/mpconfigboard.mk +++ b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/mpconfigboard.mk @@ -1,6 +1,6 @@ USB_VID = 0x1B4F USB_PID = 0x0025 -USB_PRODUCT = "ThingPlus RP2040" +USB_PRODUCT = "Thing Plus RP2040" USB_MANUFACTURER = "SparkFun" CHIP_VARIANT = RP2040 diff --git a/ports/raspberrypi/boards/sparkfun_thingplus_rp2040/pins.c b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/pins.c similarity index 100% rename from ports/raspberrypi/boards/sparkfun_thingplus_rp2040/pins.c rename to ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/pins.c