From cba7a812fc8cd5ec9adf2673e834427c84d0011c Mon Sep 17 00:00:00 2001 From: Liz Date: Tue, 2 May 2023 17:02:59 -0400 Subject: [PATCH 1/3] Minor update for Feather RP2040 ThinkInk hihi - updating board name from EPD to ThinkInk and adding pin def for board.BUTTON --- .../boards/adafruit_feather_rp2040_epd/mpconfigboard.h | 2 +- .../boards/adafruit_feather_rp2040_epd/mpconfigboard.mk | 2 +- ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h index 356f0f5b54..e76281e893 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h @@ -1,4 +1,4 @@ -#define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 EPD" +#define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2040 ThinkInk" #define MICROPY_HW_MCU_NAME "rp2040" #define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO20) diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk index 3b457b93cb..1f71dcb76b 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk @@ -1,6 +1,6 @@ USB_VID = 0x239A USB_PID = 0x812C -USB_PRODUCT = "Feather RP2040 EPD" +USB_PRODUCT = "Feather RP2040 ThinkInk" USB_MANUFACTURER = "Adafruit" CHIP_VARIANT = RP2040 diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c index 22ae43adad..72793fbd56 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c @@ -21,6 +21,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) }, { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) }, { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) }, From facd3a4e784a8decd5b9eeed16824963c105d1d5 Mon Sep 17 00:00:00 2001 From: Liz Date: Tue, 2 May 2023 17:07:49 -0400 Subject: [PATCH 2/3] Updating directory name --- .../board.c | 0 .../mpconfigboard.h | 0 .../mpconfigboard.mk | 0 .../pico-sdk-configboard.h | 0 .../pins.c | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename ports/raspberrypi/boards/{adafruit_feather_rp2040_epd => adafruit_feather_rp2040_thinkink}/board.c (100%) rename ports/raspberrypi/boards/{adafruit_feather_rp2040_epd => adafruit_feather_rp2040_thinkink}/mpconfigboard.h (100%) rename ports/raspberrypi/boards/{adafruit_feather_rp2040_epd => adafruit_feather_rp2040_thinkink}/mpconfigboard.mk (100%) rename ports/raspberrypi/boards/{adafruit_feather_rp2040_epd => adafruit_feather_rp2040_thinkink}/pico-sdk-configboard.h (100%) rename ports/raspberrypi/boards/{adafruit_feather_rp2040_epd => adafruit_feather_rp2040_thinkink}/pins.c (100%) diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/board.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/board.c similarity index 100% rename from ports/raspberrypi/boards/adafruit_feather_rp2040_epd/board.c rename to ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/board.c diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/mpconfigboard.h similarity index 100% rename from ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.h rename to ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/mpconfigboard.h diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/mpconfigboard.mk similarity index 100% rename from ports/raspberrypi/boards/adafruit_feather_rp2040_epd/mpconfigboard.mk rename to ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/mpconfigboard.mk diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pico-sdk-configboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pico-sdk-configboard.h similarity index 100% rename from ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pico-sdk-configboard.h rename to ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pico-sdk-configboard.h diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c similarity index 100% rename from ports/raspberrypi/boards/adafruit_feather_rp2040_epd/pins.c rename to ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c From 480c4f10816325ac685150c2f3a261a99113fa14 Mon Sep 17 00:00:00 2001 From: Liz Date: Tue, 2 May 2023 17:27:53 -0400 Subject: [PATCH 3/3] Update pins.c --- .../raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c index 72793fbd56..919b495abc 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c @@ -21,7 +21,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) }, { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO7) }, - { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO7) }, { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO3) },