Skip to content

Commit 060018b

Browse files
ladyadaladyada
authored
Merge pull request #9490 from tannewt/rp2350
Add support for the new RP2350
2 parents f8f1741 + 347d035 commit 060018b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2747
-292
lines changed

‎.github/workflows/build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,13 @@ jobs:
255255
wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi.zip
256256
unzip -q -d /tmp gcc-arm.zip
257257
tar -C /tmp/arm-gnu-toolchain* -cf - . | tar -C /usr/local -xf -
258-
pip install wheel
259-
# requirements_dev.txt doesn't install on windows. (with msys2 python)
258+
# We could use a venv instead, but that requires entering the venv on each run step
259+
# that runs in its own shell. There are some actions that help with that, but not for msys2
260+
# that I can find. (dhalbert)
261+
pip install --break-system-packages wheel
262+
# requirements-dev.txt doesn't install on windows. (with msys2 python)
260263
# instead, pick a subset for what we want to do
261-
pip install cascadetoml jinja2 typer click intelhex
264+
pip install --break-system-packages cascadetoml jinja2 typer click intelhex
262265
# check that installed packages work....?
263266
which python; python --version; python -c "import cascadetoml"
264267
which python3; python3 --version; python3 -c "import cascadetoml"

‎.gitmodules

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
url = https://github.com/adafruit/nrfx.git
6969
[submodule "lib/tinyusb"]
7070
path = lib/tinyusb
71-
url = https://github.com/hathach/tinyusb.git
72-
branch = master
71+
url = https://github.com/tannewt/tinyusb.git
72+
branch = esp_fix
7373
fetchRecurseSubmodules = false
7474
[submodule "tools/huffman"]
7575
path = tools/huffman
@@ -344,8 +344,8 @@
344344
url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git
345345
[submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
346346
path = ports/raspberrypi/lib/Pico-PIO-USB
347-
url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
348-
branch = main
347+
url = https://github.com/adafruit/Pico-PIO-USB.git
348+
branch = sdk2_fix
349349
[submodule "lib/micropython-lib"]
350350
path = lib/micropython-lib
351351
url = https://github.com/micropython/micropython-lib.git

‎.pre-commit-config.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ repos:
88
hooks:
99
- id: check-yaml
1010
- id: end-of-file-fixer
11-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
11+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/raspberrypi/sdk|lib/tinyusb)'
1212
- id: trailing-whitespace
13-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff)'
13+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff|ports/raspberrypi/sdk|lib/tinyusb)'
1414
- repo: https://github.com/codespell-project/codespell
1515
rev: v2.2.4
1616
hooks:
@@ -22,7 +22,8 @@ repos:
2222
lib/|
2323
tests/unicode/data/utf-8_invalid.txt|
2424
tests/extmod/data/qr.pgm|
25-
tests/basics/bytearray_byte_operations.py
25+
tests/basics/bytearray_byte_operations.py|
26+
ports/raspberrypi/sdk
2627
)
2728
- repo: local
2829
hooks:
@@ -37,3 +38,8 @@ repos:
3738
entry: python3 tools/codeformat.py
3839
types_or: [c, python]
3940
language: system
41+
exclude: |
42+
(?x)^(
43+
lib/tinyusb|
44+
ports/raspberrypi/sdk
45+
)

‎lib/tinyusb

Submodule tinyusb updated 212 files

‎lib/tlsf

Submodule tlsf updated 1 file

‎locale/circuitpython.pot

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ msgstr ""
109109
#: ports/espressif/common-hal/espulp/ULP.c
110110
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
111111
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
112-
#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
112+
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
113+
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c
113114
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
114115
#: ports/raspberrypi/common-hal/usb_host/Port.c
115116
#: shared-bindings/digitalio/DigitalInOut.c
@@ -153,7 +154,7 @@ msgstr ""
153154
msgid "%q length must be >= %d"
154155
msgstr ""
155156

156-
#: py/objmodule.c py/runtime.c
157+
#: py/modsys.c py/objmodule.c py/runtime.c
157158
msgid "%q moved from %q to %q"
158159
msgstr ""
159160

@@ -509,7 +510,7 @@ msgid "All event channels in use"
509510
msgstr ""
510511

511512
#: ports/raspberrypi/common-hal/floppyio/__init__.c
512-
#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
513+
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
513514
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
514515
#: ports/raspberrypi/common-hal/usb_host/Port.c
515516
msgid "All state machines in use"
@@ -519,7 +520,7 @@ msgstr ""
519520
msgid "All sync event channels in use"
520521
msgstr ""
521522

522-
#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
523+
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
523524
msgid "All timers for this pin are in use"
524525
msgstr ""
525526

@@ -1160,7 +1161,9 @@ msgstr ""
11601161
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
11611162
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
11621163
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
1163-
#: ports/cxd56/common-hal/pulseio/PulseIn.c shared-bindings/pwmio/PWMOut.c
1164+
#: ports/cxd56/common-hal/pulseio/PulseIn.c
1165+
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c
1166+
#: shared-bindings/pwmio/PWMOut.c
11641167
msgid "Internal resource(s) in use"
11651168
msgstr ""
11661169

@@ -1181,12 +1184,16 @@ msgstr ""
11811184
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
11821185
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
11831186
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
1184-
#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
1187+
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c py/argcheck.c
11851188
#: shared-bindings/digitalio/DigitalInOut.c
11861189
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
11871190
msgid "Invalid %q"
11881191
msgstr ""
11891192

1193+
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c
1194+
msgid "Invalid %q and %q"
1195+
msgstr ""
1196+
11901197
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
11911198
#: ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.c
11921199
#: ports/mimxrt10xx/common-hal/microcontroller/Pin.c
@@ -2329,6 +2336,7 @@ msgid "You pressed the SW38 button at start up."
23292336
msgstr ""
23302337

23312338
#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
2339+
#: ports/espressif/boards/vidi_x/mpconfigboard.h
23322340
msgid "You pressed the VOLUME button at start up."
23332341
msgstr ""
23342342

‎ports/espressif/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,10 @@ ifneq ($(IDF_TARGET),esp32c6)
181181
endif
182182

183183
ifeq ($(IDF_TARGET_ARCH),xtensa)
184-
CFLAGS += -mlongcalls
184+
# Remove the last two flags once TinyUSB is updated with the `#include <xtensa_api.h>` instead of
185+
# `#include "xtensa/xtensa_api.h"`.
186+
187+
CFLAGS += -mlongcalls -isystem esp-idf/components/xtensa/deprecated_include/ -Wno-error=cpp
185188
else ifeq ($(IDF_TARGET_ARCH),riscv)
186189
CFLAGS += -march=rv32imac_zicsr_zifencei
187190
endif

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy