From 401905eae95693c1ab677484ae9071663e72781d Mon Sep 17 00:00:00 2001 From: johnnohj <166672127+johnnohj@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:24:46 -0400 Subject: [PATCH 1/6] Add Waveshare RP2040 One --- .../board/wvsh_rp2040_one_u2if.py | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py diff --git a/src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py b/src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py new file mode 100644 index 00000000..302a3867 --- /dev/null +++ b/src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py @@ -0,0 +1,61 @@ +# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries +# +# SPDX-License-Identifier: MIT +""" +Pin definitions for the Waveshare RP2040 One with u2if firmware. + +Adafruit CircuitPython 6.2.0 on 2021-04-05; Waveshare RP2040 One with rp2040 +>>> import board +>>> board. +A0 A1 A2 A3 +D2 D3 D10 D11 +D12 D13 D14 D15 +D17 D18 D19 D20 +D21 D22 D23 D24 +D25 D9 I2C MISO +MOSI NEOPIXEL RX SCK +SCL SDA SPI TX +UART +""" + +from adafruit_blinka.microcontroller.rp2040_u2if import pin + +D2 = pin.GP2 +D3 = pin.GP3 +D9 = pin.GP9 +D10 = pin.GP10 +D11 = pin.GP11 +D12 = pin.GP12 +D13 = pin.GP13 +D14 = pin.GP14 +D15 = pin.GP15 +D17 = pin.GP17 +D18 = pin.GP18 +D19 = pin.GP19 +D20 = pin.GP20 +D21 = pin.GP21 +D22 = pin.GP22 +D23 = pin.GP23 +D24 = pin.GP24 +D25 = pin.GP25 + +A0 = pin.GP26 +A1 = pin.GP27 +A2 = pin.GP28 +# A3 = pin.GP29 # not currently supported in firmware + +NEOPIXEL = pin.GP16 + +TX = pin.GP0 +RX = pin.GP1 + +SCL = pin.GP5 +SDA = pin.GP4 + +SCLK = SCK = pin.GP6 +MOSI = pin.GP7 +MISO = pin.GP8 + +# access u2if via pin instance to open for specifc VID/PID +# pylint:disable = protected-access +pin.GP0._u2if_open_hid(0x2E9A, 0x111F) From 17dbcb676938d8258637da2ab2ce6a4e5015d160 Mon Sep 17 00:00:00 2001 From: johnnohj <166672127+johnnohj@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:31:38 -0400 Subject: [PATCH 2/6] Update wvsh_rp2040_one_u2if.py Add Waveshare RP2040 One U2IF, Update PID --- src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py b/src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py index 302a3867..6d5b00a2 100644 --- a/src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py +++ b/src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py @@ -58,4 +58,4 @@ # access u2if via pin instance to open for specifc VID/PID # pylint:disable = protected-access -pin.GP0._u2if_open_hid(0x2E9A, 0x111F) +pin.GP0._u2if_open_hid(0x2E8A, 0x111F) From 1f057f3f17ac194d955a40e962df447fd71a58bc Mon Sep 17 00:00:00 2001 From: johnnohj <166672127+johnnohj@users.noreply.github.com> Date: Thu, 1 Aug 2024 10:10:21 -0400 Subject: [PATCH 3/6] Update board.py --- src/board.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/board.py b/src/board.py index e8a58166..e86722c8 100644 --- a/src/board.py +++ b/src/board.py @@ -404,6 +404,9 @@ elif board_id == ap_board.WALNUT_PI_1B: from adafruit_blinka.board.walnutpi.walnutpi1b import * +elif board_id == ap_board.WAVESHARE_RP2040_ONE_U2IF: + from adafruit_blinka.board.wvsh_rp2040_one_u2if import * + elif board_id == ap_board.OS_AGNOSTIC_BOARD: from adafruit_blinka.board.generic_agnostic_board import * From 3790988eed32ab819184c895686781f15418594b Mon Sep 17 00:00:00 2001 From: johnnohj <166672127+johnnohj@users.noreply.github.com> Date: Wed, 7 Aug 2024 16:24:08 -0400 Subject: [PATCH 4/6] Update and rename wvsh_rp2040_one_u2if.py to rp2040_one_u2if.py --- .../board/{wvsh_rp2040_one_u2if.py => rp2040_one_u2if.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/adafruit_blinka/board/{wvsh_rp2040_one_u2if.py => rp2040_one_u2if.py} (91%) diff --git a/src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py b/src/adafruit_blinka/board/rp2040_one_u2if.py similarity index 91% rename from src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py rename to src/adafruit_blinka/board/rp2040_one_u2if.py index 6d5b00a2..36a77309 100644 --- a/src/adafruit_blinka/board/wvsh_rp2040_one_u2if.py +++ b/src/adafruit_blinka/board/rp2040_one_u2if.py @@ -4,7 +4,7 @@ """ Pin definitions for the Waveshare RP2040 One with u2if firmware. -Adafruit CircuitPython 6.2.0 on 2021-04-05; Waveshare RP2040 One with rp2040 +Adafruit CircuitPython; Waveshare RP2040 One with rp2040 >>> import board >>> board. A0 A1 A2 A3 @@ -58,4 +58,4 @@ # access u2if via pin instance to open for specifc VID/PID # pylint:disable = protected-access -pin.GP0._u2if_open_hid(0x2E8A, 0x111F) +pin.GP0._u2if_open_hid(0x2E8A, 0x103A) From 8cac82615d4f4efd37e0067845040c4e0d5cfb05 Mon Sep 17 00:00:00 2001 From: johnnohj <166672127+johnnohj@users.noreply.github.com> Date: Wed, 7 Aug 2024 17:56:26 -0400 Subject: [PATCH 5/6] Update board.py --- src/board.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/board.py b/src/board.py index e86722c8..8105fd41 100644 --- a/src/board.py +++ b/src/board.py @@ -404,8 +404,8 @@ elif board_id == ap_board.WALNUT_PI_1B: from adafruit_blinka.board.walnutpi.walnutpi1b import * -elif board_id == ap_board.WAVESHARE_RP2040_ONE_U2IF: - from adafruit_blinka.board.wvsh_rp2040_one_u2if import * +elif board_id == ap_board.RP2040_ONE_U2IF: + from adafruit_blinka.board.rp2040_one_u2if import * elif board_id == ap_board.OS_AGNOSTIC_BOARD: from adafruit_blinka.board.generic_agnostic_board import * From 48d4ffdf195bb76496b10d9b3a6abaae372ba1d8 Mon Sep 17 00:00:00 2001 From: johnnohj <166672127+johnnohj@users.noreply.github.com> Date: Wed, 7 Aug 2024 22:12:49 +0000 Subject: [PATCH 6/6] Corrections via pre-commit --- src/adafruit_blinka/board/rp2040_one_u2if.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/adafruit_blinka/board/rp2040_one_u2if.py b/src/adafruit_blinka/board/rp2040_one_u2if.py index 36a77309..5379fd18 100644 --- a/src/adafruit_blinka/board/rp2040_one_u2if.py +++ b/src/adafruit_blinka/board/rp2040_one_u2if.py @@ -12,9 +12,9 @@ D12 D13 D14 D15 D17 D18 D19 D20 D21 D22 D23 D24 -D25 D9 I2C MISO -MOSI NEOPIXEL RX SCK -SCL SDA SPI TX +D25 D9 I2C MISO +MOSI NEOPIXEL RX SCK +SCL SDA SPI TX UART """