adafruit · tannewt · Dec 18, 2024 · Dec 17, 2024 · Dec 17, 2024
diff --git a/ports/raspberrypi/boards/waveshare_rp2350_geek/board.c b/ports/raspberrypi/boards/waveshare_rp2350_geek/board.c
@@ -0,0 +1,86 @@
+// 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 "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+#include "shared-bindings/board/__init__.h"
+
+#define DELAY 0x80
+
+
+// display init sequence according to https://github.com/adafruit/Adafruit_CircuitPython_ST7789
+uint8_t display_init_sequence[] = {
+    0x01, 0 | DELAY, 0x96,  // _SWRESET and Delay 150ms
+    0x11, 0 | DELAY, 0xFF,  // _SLPOUT and Delay 500ms
+    0x3A, 0x81, 0x55, 0x0A,  // _COLMOD and Delay 10ms
+    0x36, 0x01, 0x08,  // _MADCTL
+    0x21, 0 | DELAY, 0x0A,  // _INVON Hack and Delay 10ms
+    0x13, 0 | DELAY, 0x0A,  // _NORON and Delay 10ms
+    0x36, 0x01, 0xC0,  // _MADCTL
+    0x29, 0 | DELAY, 0xFF,  // _DISPON and Delay 500ms
+};
+
+static void display_init(void) {
+
+    busio_spi_obj_t *spi = common_hal_board_create_spi(0);
+    fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+
+    bus->base.type = &fourwire_fourwire_type;
+
+    common_hal_fourwire_fourwire_construct(
+        bus,
+        spi,
+        &pin_GPIO8,  // TFT_DC
+        &pin_GPIO9,  // TFT_CS
+        &pin_GPIO12,  // TFT_RST
+        50000000, // Baudrate
+        0, // Polarity
+        0 // Phase
+
+        );
+
+    busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
+    display->base.type = &busdisplay_busdisplay_type;
+
+    common_hal_busdisplay_busdisplay_construct(
+        display,
+        bus,
+        240, // Width
+        135, // Height
+        53, // column start
+        40, // row start
+        270, // rotation
+        16, // Color depth
+        false, // Grayscale
+        false, // Pixels in a byte share a row
+        1, // bytes per cell
+        false, // reverse_pixels_in_byte
+        true, // reverse_pixels_in_word
+        MIPI_COMMAND_SET_COLUMN_ADDRESS, // set column command
+        MIPI_COMMAND_SET_PAGE_ADDRESS, // set row command
+        MIPI_COMMAND_WRITE_MEMORY_START, // write memory command
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO25, // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f, // brightness
+        false, // single_byte_bounds
+        false, // data_as_commands
+        true, // auto_refresh
+        60, // native_frames_per_second
+        true, // backlight_on_high
+        false, // SH1107_addressing
+        1000 // backlight pwm frequency
+        );
+}
+
+void board_init(void) {
+    display_init();
+}
diff --git a/ports/raspberrypi/boards/waveshare_rp2350_geek/mpconfigboard.h b/ports/raspberrypi/boards/waveshare_rp2350_geek/mpconfigboard.h
@@ -0,0 +1,22 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
+// SPDX-FileCopyrightText: Copyright (c) 2024 Cooper Dalrymple
+//
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+// Micropython setup
+#define MICROPY_HW_BOARD_NAME "Waveshare RP2350-GEEK"
+#define MICROPY_HW_MCU_NAME "rp2350"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO29, .sda = &pin_GPIO28}}
+
+#define CIRCUITPY_BOARD_SPI         (2)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO10, .mosi = &pin_GPIO11}, \
+                                     {.clock = &pin_GPIO18, .mosi = &pin_GPIO19, .miso = &pin_GPIO20}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO4, .rx = &pin_GPIO5}}
diff --git a/ports/raspberrypi/boards/waveshare_rp2350_geek/mpconfigboard.mk b/ports/raspberrypi/boards/waveshare_rp2350_geek/mpconfigboard.mk
@@ -0,0 +1,12 @@
+USB_VID = 0x2E8A
+USB_PID = 0x10B6
+USB_PRODUCT = "RP2350-GEEK"
+USB_MANUFACTURER = "Waveshare Electronics"
+
+CHIP_VARIANT = RP2350
+CHIP_PACKAGE = A
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
+
+CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/waveshare_rp2350_geek/pico-sdk-configboard.h b/ports/raspberrypi/boards/waveshare_rp2350_geek/pico-sdk-configboard.h
@@ -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
+
+#pragma once
+
+// Put board-specific pico-sdk definitions here. This file must exist.
diff --git a/ports/raspberrypi/boards/waveshare_rp2350_geek/pins.c b/ports/raspberrypi/boards/waveshare_rp2350_geek/pins.c
@@ -0,0 +1,78 @@
+// 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 "shared-module/displayio/__init__.h"
+
+CIRCUITPY_BOARD_BUS_SINGLETON(sd_spi, spi, 1)
+static const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // 2-3 DEBUG
+    { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
+    // 4-5 UART
+    { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
+    // 8-12 LCD
+    { 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) },
+    // 16-17 I2C
+    { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
+    // 18-23 SD Card
+    { 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_GP23), MP_ROM_PTR(&pin_GPIO23) },
+    // 25 LCD Backlight
+    { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
+    // 28-29 I2C
+    { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) },
+
+    // UART
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+
+    // I2C
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+
+    // SPI SD Card
+    { MP_ROM_QSTR(MP_QSTR_SD_SCK),  MP_ROM_PTR(&pin_GPIO18)},
+    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO19)},
+    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO20)},
+    { MP_ROM_QSTR(MP_QSTR_SD_CS),   MP_ROM_PTR(&pin_GPIO23)},
+    { MP_ROM_QSTR(MP_QSTR_SD_SPI), MP_ROM_PTR(&board_sd_spi_obj) },
+
+    // SDIO SD Card
+    { MP_ROM_QSTR(MP_QSTR_SDIO_CLK),  MP_ROM_PTR(&pin_GPIO18)},
+    { MP_ROM_QSTR(MP_QSTR_SDIO_COMMAND), MP_ROM_PTR(&pin_GPIO19)},
+    { MP_ROM_QSTR(MP_QSTR_SDIO_DATA0), MP_ROM_PTR(&pin_GPIO20)},
+    { MP_ROM_QSTR(MP_QSTR_SDIO_DATA1), MP_ROM_PTR(&pin_GPIO21)},
+    { MP_ROM_QSTR(MP_QSTR_SDIO_DATA2), MP_ROM_PTR(&pin_GPIO22)},
+    { MP_ROM_QSTR(MP_QSTR_SDIO_DATA3),   MP_ROM_PTR(&pin_GPIO23)},
+
+    // LCD
+    { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_BACKLIGHT), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_SPI), MP_ROM_PTR(&board_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
+
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/raspberrypi/boards/waveshare_rp2350_lcd_0_96/board.c b/ports/raspberrypi/boards/waveshare_rp2350_lcd_0_96/board.c
@@ -0,0 +1,109 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+#include "supervisor/board.h"
+#include "mpconfigboard.h"
+#include "shared-module/displayio/__init__.h"
+#include "shared-module/displayio/mipi_constants.h"
+
+#define DELAY 0x80
+
+
+// display init sequence according to Adafruit_CircuitPython_ST7735R
+// https://github.com/adafruit/Adafruit_CircuitPython_ST7735R
+uint8_t display_init_sequence[] = {
+    // sw reset
+    0x01, 0 | DELAY, 0x96,
+    // SLPOUT and Delay
+    0x11, 0 | DELAY, 0xFF,
+    0xB1, 0x03, 0x01, 0x2C, 0x2D,      // _FRMCTR1
+    0xB3, 0x06, 0x01, 0x2C, 0x2D, 0x01, 0x2C, 0x2D,     // _FRMCTR3
+    0xB4, 0x01, 0x07, // _INVCTR line inversion
+    0xC0, 0x03, 0xA2, 0x02, 0x84, // _PWCTR1 GVDD = 4.7V, 1.0uA
+    0xC1, 0x01, 0xC5, // _PWCTR2 VGH=14.7V, VGL=-7.35V
+    0xC2, 0x02, 0x0A, 0x00, // _PWCTR3 Opamp current small, Boost frequency
+    0xC3, 0x02, 0x8A, 0x2A,
+    0xC4, 0x02, 0x8A, 0xEE,
+    0xC5, 0x01, 0x0E, // _VMCTR1 VCOMH = 4V, VOML = -1.1V
+    0x20, 0x00, // _INVOFF
+    0x36, 0x01, 0x18, // _MADCTL bottom to top refresh
+    // 1 clk cycle nonoverlap, 2 cycle gate rise, 3 cycle osc equalie,
+    // fix on VTL
+    0x3A, 0x01, 0x05, // COLMOD - 16bit color
+    0xE0, 0x10, 0x02, 0x1C, 0x07, 0x12, 0x37, 0x32, 0x29, 0x2D, 0x29, 0x25, 0x2B, 0x39, 0x00, 0x01, 0x03, 0x10, // _GMCTRP1 Gamma
+    0xE1, 0x10, 0x03, 0x1D, 0x07, 0x06, 0x2E, 0x2C, 0x29, 0x2D, 0x2E, 0x2E, 0x37, 0x3F, 0x00, 0x00, 0x02, 0x10, // _GMCTRN1
+    0x13, 0 | DELAY, 0x0A, // _NORON
+    0x29, 0 | DELAY, 0x64, // _DISPON
+    // 0x36, 0x01, 0xC0,  // _MADCTL Default rotation plus BGR encoding
+    0x36, 0x01, 0xC8,      // _MADCTL Default rotation plus RGB encoding
+    0x21, 0x00,      // _INVON
+};
+
+static void display_init(void) {
+    fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
+    busio_spi_obj_t *spi = &bus->inline_bus;
+    common_hal_busio_spi_construct(
+        spi,
+        &pin_GPIO10,    // CLK
+        &pin_GPIO11,    // MOSI
+        NULL,           // MISO not connected
+        false           // Not half-duplex
+        );
+
+    common_hal_busio_spi_never_reset(spi);
+
+    bus->base.type = &fourwire_fourwire_type;
+
+    common_hal_fourwire_fourwire_construct(
+        bus,
+        spi,
+        &pin_GPIO8,     // DC
+        &pin_GPIO9,     // CS
+        &pin_GPIO12,    // RST
+        40000000,       // baudrate
+        0,              // polarity
+        0               // phase
+        );
+
+    busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
+    display->base.type = &busdisplay_busdisplay_type;
+    common_hal_busdisplay_busdisplay_construct(
+        display,
+        bus,
+        160,            // width (after rotation)
+        80,             // height (after rotation)
+        26,             // column start
+        1,              // row start
+        90,             // rotation
+        16,             // color depth
+        false,          // grayscale
+        false,          // pixels in a byte share a row. Only valid for depths < 8
+        1,              // bytes per cell. Only valid for depths < 8
+        false,          // reverse_pixels_in_byte. Only valid for depths < 8
+        true,           // reverse_pixels_in_word
+        MIPI_COMMAND_SET_COLUMN_ADDRESS,    // set column command
+        MIPI_COMMAND_SET_PAGE_ADDRESS,      // set row command
+        MIPI_COMMAND_WRITE_MEMORY_START,    // write memory command
+        display_init_sequence,
+        sizeof(display_init_sequence),
+        &pin_GPIO25,    // backlight pin
+        NO_BRIGHTNESS_COMMAND,
+        1.0f,           // brightness
+        false,          // single_byte_bounds
+        false,          // data_as_commands
+        true,           // auto_refresh
+        60,             // native_frames_per_second
+        true,           // backlight_on_high
+        false,          // SH1107_addressing
+        50000           // backlight pwm frequency
+        );
+}
+
+void board_init(void) {
+    // Display
+    display_init();
+}
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/waveshare_rp2350_lcd_0_96/mpconfigboard.h b/ports/raspberrypi/boards/waveshare_rp2350_lcd_0_96/mpconfigboard.h
@@ -0,0 +1,20 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+// SPDX-FileCopyrightText: Copyright (c) 2024 Cooper Dalrymple
+//
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#define MICROPY_HW_BOARD_NAME "Waveshare RP2350-LCD-0.96"
+#define MICROPY_HW_MCU_NAME "rp2350"
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO21, .sda = &pin_GPIO20}}
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO19, .miso = &pin_GPIO16}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO0, .rx = &pin_GPIO1}}
diff --git a/ports/raspberrypi/boards/waveshare_rp2350_lcd_0_96/mpconfigboard.mk b/ports/raspberrypi/boards/waveshare_rp2350_lcd_0_96/mpconfigboard.mk
@@ -0,0 +1,12 @@
+USB_VID = 0x2E8A
+USB_PID = 0x10B7
+USB_PRODUCT = "Waveshare RP2350-LCD-0.96"
+USB_MANUFACTURER = "Waveshare Electronics"
+
+CHIP_VARIANT = RP2350
+CHIP_PACKAGE = A
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "P25Q32SH"
+
+CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/waveshare_rp2350_lcd_0_96/pico-sdk-configboard.h b/ports/raspberrypi/boards/waveshare_rp2350_lcd_0_96/pico-sdk-configboard.h
@@ -0,0 +1,9 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+// Put board-specific pico-sdk definitions here. This file must exist.