From 583197d9c3b2fe4fbc73808337b80ecfa89a6563 Mon Sep 17 00:00:00 2001 From: Nate Gay Date: Sat, 4 Jan 2025 22:02:54 -0600 Subject: [PATCH 1/3] Add proveskit-rp2040-v4 --- .../boards/proveskit_rp2040_v4/board.c | 9 +++ .../proveskit_rp2040_v4/mpconfigboard.h | 28 ++++++++++ .../proveskit_rp2040_v4/mpconfigboard.mk | 9 +++ .../pico-sdk-configboard.h | 12 ++++ .../boards/proveskit_rp2040_v4/pins.c | 55 +++++++++++++++++++ 5 files changed, 113 insertions(+) create mode 100644 ports/raspberrypi/boards/proveskit_rp2040_v4/board.c create mode 100644 ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/proveskit_rp2040_v4/pico-sdk-configboard.h create mode 100644 ports/raspberrypi/boards/proveskit_rp2040_v4/pins.c diff --git a/ports/raspberrypi/boards/proveskit_rp2040_v4/board.c b/ports/raspberrypi/boards/proveskit_rp2040_v4/board.c new file mode 100644 index 0000000000000..6dc59205e4eb0 --- /dev/null +++ b/ports/raspberrypi/boards/proveskit_rp2040_v4/board.c @@ -0,0 +1,9 @@ +// This file is part of the CircuitPython project: https://circuitpython.org +// +// SPDX-FileCopyrightText: Copyright (c) 2024 Adafruit Industries LLC +// +// SPDX-License-Identifier: MIT + +#include "supervisor/board.h" +#include "mpconfigboard.h" +#include "common-hal/microcontroller/Pin.h" diff --git a/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h b/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h new file mode 100644 index 0000000000000..02438571cfc6d --- /dev/null +++ b/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h @@ -0,0 +1,28 @@ +// This file is part of the CircuitPython project: https://circuitpython.org +// +// SPDX-FileCopyrightText: Copyright (c) 2024 Adafruit Industries LLC +// +// SPDX-License-Identifier: MIT + +#pragma once + +#define MICROPY_HW_BOARD_NAME "PROVES Kit v4" +#define MICROPY_HW_MCU_NAME "rp2040" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO24) + +#define CIRCUITPY_INTERNAL_NVM_SIZE (4 * 1024) +#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (48 * 1024) +#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE) + +#define CIRCUITPY_DRIVE_LABEL "PROVESKIT" + +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO10) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO8) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO11) + +#define DEFAULT_UART_BUS_RX (&pin_GPIO1) +#define DEFAULT_UART_BUS_TX (&pin_GPIO0) diff --git a/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.mk b/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.mk new file mode 100644 index 0000000000000..7ae012032f711 --- /dev/null +++ b/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.mk @@ -0,0 +1,9 @@ +USB_VID = 0x1209 +USB_PID = 0xE004 +USB_PRODUCT = "ProvesKit RP2040 v4" +USB_MANUFACTURER = "Bronco Space" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ" diff --git a/ports/raspberrypi/boards/proveskit_rp2040_v4/pico-sdk-configboard.h b/ports/raspberrypi/boards/proveskit_rp2040_v4/pico-sdk-configboard.h new file mode 100644 index 0000000000000..d109816d1382f --- /dev/null +++ b/ports/raspberrypi/boards/proveskit_rp2040_v4/pico-sdk-configboard.h @@ -0,0 +1,12 @@ +// This file is part of the CircuitPython project: https://circuitpython.org +// +// SPDX-FileCopyrightText: Copyright (c) 2024 Adafruit Industries LLC +// +// SPDX-License-Identifier: MIT + +#pragma once + +// 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/proveskit_rp2040_v4/pins.c b/ports/raspberrypi/boards/proveskit_rp2040_v4/pins.c new file mode 100644 index 0000000000000..cb3861010fccb --- /dev/null +++ b/ports/raspberrypi/boards/proveskit_rp2040_v4/pins.c @@ -0,0 +1,55 @@ +// This file is part of the CircuitPython project: https://circuitpython.org +// +// SPDX-FileCopyrightText: Copyright (c) 2024 Adafruit Industries LLC +// +// SPDX-License-Identifier: MIT + +#include "shared-bindings/board/__init__.h" +#include "supervisor/board.h" + +static const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_SPI0_CS1), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_NEO_PWR), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_SPI0_CS2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO29) }, + + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO16) }, + + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) }, + + { MP_ROM_QSTR(MP_QSTR_I2C1_SDA), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_I2C1_SCL), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_I2C0_SDA), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_I2C0_SCL), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_PC), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_VS), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_SPI0_MISO), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_SPI0_CS0), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_SPI0_SCK), MP_ROM_PTR(&pin_GPIO10) }, + + { MP_ROM_QSTR(MP_QSTR_SPI0_MOSI), MP_ROM_PTR(&pin_GPIO11) }, + + { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO12) }, + + { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_RF1_RST), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_WDT_WDI), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_RF1_IO4), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_RF1_IO0), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIX), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_HS), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO17) }, + + { 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_module_globals_table); From 0e77da31a5bad17023a2eafab5d803502c8cd4a7 Mon Sep 17 00:00:00 2001 From: Nate Gay Date: Wed, 12 Mar 2025 20:19:31 -0500 Subject: [PATCH 2/3] Remove filesystem_size definition --- ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h b/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h index 02438571cfc6d..68d699fcfc9f1 100644 --- a/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h +++ b/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h @@ -12,7 +12,6 @@ #define MICROPY_HW_NEOPIXEL (&pin_GPIO24) #define CIRCUITPY_INTERNAL_NVM_SIZE (4 * 1024) -#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (48 * 1024) #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE) #define CIRCUITPY_DRIVE_LABEL "PROVESKIT" From e56e53169636b00b54e9f955695dac0003ff2656 Mon Sep 17 00:00:00 2001 From: Nate Gay Date: Thu, 13 Mar 2025 23:32:12 -0400 Subject: [PATCH 3/3] Update ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h Co-authored-by: Scott Shawcroft --- ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h b/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h index 68d699fcfc9f1..4c2f9a93b0743 100644 --- a/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h +++ b/ports/raspberrypi/boards/proveskit_rp2040_v4/mpconfigboard.h @@ -11,9 +11,6 @@ #define MICROPY_HW_NEOPIXEL (&pin_GPIO24) -#define CIRCUITPY_INTERNAL_NVM_SIZE (4 * 1024) -#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE) - #define CIRCUITPY_DRIVE_LABEL "PROVESKIT" #define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)