Compare commits

...

78 commits

Author SHA1 Message Date
Limor "Ladyada" Fried
775fb76cb8
Merge branch 'earlephilhower:master' into master 2025-06-15 16:20:49 -04:00
ladyada
af1374cb18 fix pins for rev C 2025-06-15 14:05:16 -04:00
Earle F. Philhower, III
f07079bb7d
Remove dead debug code in PIOProgram (#2992) 2025-06-12 11:15:12 -07:00
Earle F. Philhower, III
e7a23550ce
Update to GCC 14.3, Newlib 4.5.0 (#2975)
Moves to just released GCC 14.3

Moves to full-fat printf/scanf because Newlib no longer supports all the
calls libstdc++ requires with the older, smaller, nano-formatted-io option.

Moves to latest SDK develop branch with important float acceleration fixes
for the RP2350, among other updates.

Moves to latest pioasm, picotool develop branches

* SDK was refactored, update the includes
* Rebuild PicoSDK and BearSSL libs
* Update certs in BSSL validation example
* Don't spell check the certs!
* Updated tools with full fat++ newlib printf/scanf
2025-06-12 10:54:37 -07:00
Earle F. Philhower, III
0beb2d4ae8
Add SDIO PIN definitions for Adafruit Metro RP2040 (#2989)
Fixes #2985
2025-06-12 08:16:55 -07:00
ladyada
e5efb8b764 fix missing peripherals, this is for rev C 2025-06-01 15:29:48 -04:00
Maximilian Gerhardt
4de3ea94a9
Cleanly install PlatformIO platform from scratch (#2982)
Prevents weird update errors stemming from an already installed platform
(cached), then updating some files in it manually and then pio pkg updating it.
2025-06-01 08:08:45 -07:00
Maximilian Gerhardt
68f1da5f94
Mark all boards as picosdk compatible in PlatformIO board definition (#2980) 2025-05-31 12:19:21 -07:00
Earle F. Philhower, III
948e9bfd22
Clear any existing IP before sending a DHCP request (#2979)
Fixes #2978
2025-05-31 11:20:14 -07:00
Earle F. Philhower, III
73bd6a0891
Send DHCP request on ::begin even if lease exists (#2977)
When a link comes up, we were only sending a DHCP request if the existing
netif's ipaddress was 0.  When a DHCP lease is acquired at first that IP
is changed to the given address, and if we do another ::begin we wouldn't
dhcp_start to send a new request and use the old one (until its lease
expired).

In the case of network changing (i.e. WiFiMulti on different nets or
moving an Ethernet cable to another router) that old address would not
be valid.

Track if an IP address has been manually set and use that to determine
if DHCP needs to be re-requested instead of looking at the old netif's
ipaddress.

Fixes #2974
2025-05-31 09:19:42 -07:00
ladyada
ecd662640f Merge branch 'master' of github.com:adafruit/arduino-pico 2025-05-24 15:05:34 -04:00
ladyada
0f211d1aa5 fix button names 2025-05-24 15:05:29 -04:00
Earle F. Philhower, III
f3df355663
Fix BSTstackLib service UUID reporting to client (#2968)
Fixes #2967
2025-05-22 12:34:26 -07:00
Earle F. Philhower, III
7dcfe4d483 Update version 2025-05-22 08:19:51 -07:00
Lorandil
3df1392a1b
Added 'TwoWire::setBufferSize()' to Wire library (#2962)
'setBufferSize()' allows to modify the receive buffer size (inspired by the ESP32 code)
2025-05-21 13:57:35 -07:00
Limor "Ladyada" Fried
9043412c5f
Merge branch 'earlephilhower:master' into master 2025-05-18 15:20:50 -04:00
Earle F. Philhower, III
7c51742522
Add PSRAM option for Adafruit Metro RP2350 (#2961)
Fixes #2960
2025-05-16 08:34:01 -07:00
Earle F. Philhower, III
08353deb88 Ignore libpico build dirs for git 2025-05-14 15:00:03 -07:00
Earle F. Philhower, III
d5e844b2bd
Panic on stack protector crash instead of exit (#2955)
Newlib has a stack protector fail handler which write(2)s a
message to STDERR which doesn't work here.  Override with a
call to panic().

Tell GCC to protect all functions for stack protection instead of
ones that it heuristically decides need protection.  Slower but
safer, and only when stack protection is enabled.
2025-05-14 07:38:25 -07:00
Ricardo Marques
de7f1a7e83
Fixed generic PIN_LED and SPI0 Pin assignment on WIZnet W55RP20-EVB-Pico. (#2956)
* Update pins_arduino.h

Changed PIN_LED to match USERLED on PCB. Removed unavailable pins from SPI0 connection.

* Update pins_arduino.h

Uncommented SPI0 pins and reassigned them over GPIO 2,3,4,5.
2025-05-13 17:18:04 -07:00
jeroenzwan
19b14898ea
Add target platform for compiling (#2939)
* add target platform for compiling

* added target specification for riscv

---------

Co-authored-by: jeroen <jeroen.zwanepol@tective.nl>
2025-05-09 07:57:50 -07:00
Jan-Philipp
304e9ce2d1
Make Arduino IDE ask for OTA password (#2938) 2025-05-07 09:03:29 -07:00
Earle F. Philhower, III
2bc00bef57
Fix ADCInput masking (#2937)
Fixes #2935

The PICO_2350A patch flipped the logic of the ADCInput bitmask calcs
causing the 2040 and 2350A to use bitmasks for the 2350B (i.e. wrong
GPIOs) and vice versa.
2025-05-05 09:16:29 -07:00
Earle F. Philhower, III
47c2cd2b0b Update version 2025-05-02 08:59:52 -07:00
Ahmed ARIF
59614a99c8
optimize parity calculations in SerialPIO (#2932) (#2933)
use bit manipulation technique from http://www.graphics.stanford.edu/~seander/bithacks.html#ParityParallel for parity calculation

Co-authored-by: Ahmed ARIF <contact@eotics.com>
2025-05-01 14:06:52 -07:00
Earle F. Philhower, III
227d71ed18
Fix RP2350B SPI RX pin list (#2931)
Fixes #2930
2025-04-29 16:29:45 -07:00
Earle F. Philhower, III
5e74bbbbb2
Rewrite SerialPIO receive path, ensure proper edge (#2929)
The SerialPIO(SoftwareSerial) receive path was convoluted and required
a lot of work on the host to get the actual data out.  It also wasn't
always sampling on the proper edge leading to errors whenever clocks
or hold times shifted slightly.

Rewrite the SerialPIO RX path to explicitily wait for start bit,
pause 1/2 bit time, then idle for a full bit time for all bits.
Takes more PIO instruction memory but works flawlessly even with
mismatched clocks.

Tested with a loopback from HW UART to SW UART with a 5% clock
mismatch @ 19200 baud without reception errors, whereas the
original code would fail with less than a 0.5% variation.

Fixes #2928

````

SoftwareSerial s(15, -1);
void setup() {
  Serial1.setTX(0);
  Serial1.begin(19200 + 1920/2, SERIAL_8N1);
  s.begin(19200, SERIAL_8N1);
}

void loop() {
  Serial.println("---");
  Serial1.write("Had we but world enough and time", 32);
  uint32_t now = millis();
  while (millis() - now < 500) {
    while (s.available()) {
      auto c = s.read();
      Serial.printf("%02x '%c'\n", c, c);
    }
  }
}
````
2025-04-29 13:39:34 -07:00
Earle F. Philhower, III
8d58a9207f
Update LittleFS and Adafruit USB libraries (#2919)
Only very minor changes to the submodules were noted.  Should not have
any effect on this core.
2025-04-18 18:00:56 -07:00
Earle F. Philhower, III
bc5b2c24ff
Fix rp2040.getCycleCount() from core1 (#2915)
Fixes #2914

There are 2 systick units, one per core.  Set up and start core1's
systick unit and track each core's epoch separately.

Document a method of preserving 100% user-only code on core1
and add a core1_disable_systick boolean flag that works like the
separate stack one.
2025-04-18 09:16:36 -07:00
Wai Weng
40b9d5b07e
Add pin definitions for I2C1 on Cytron IRIV (#2916)
Co-authored-by: Kong Wai Weng <waiweng@cytron.io>
2025-04-18 08:59:23 -07:00
Earle F. Philhower, III
07ea22d877
Generate PWMAudio pacer frequencies for 176/276MHz (#2913)
Overclock settings changed, need to update the precalculated pacer
fractions for PWMAudio.
2025-04-17 08:21:14 -07:00
Earle F. Philhower, III
253e946dcb
Update tools README.md 2025-04-17 07:04:26 -07:00
Earle F. Philhower, III
60d28d6c92
Add PIO.h header verification to CI (#2911)
* Add PIO.h header verification to CI

Ensure all PIO .pio.h headers match the .pio sources in the tree

* Install all tools for Style check

* Clean up mismatched PIO headers

No functional changes, but the PDM pdm.pio file did not init a data pin
while the pdm.pio.h (the one actually used in the core) did.  Correct to
match.

* No need for submodules in the style check
2025-04-16 14:56:31 -07:00
Earle F. Philhower, III
e8bd9daa82 Update version 2025-04-16 13:22:14 -07:00
Earle F. Philhower, III
9747990c16
Fix remaining PICO_RP2350B reference (#2910)
Minor fix to #2898
2025-04-16 08:28:53 -07:00
Liz
299f8e28f2
Merge branch 'earlephilhower:master' into master 2025-04-15 13:08:44 -04:00
Liz
6e48cffd62
add adafruit fruit jam and feather rp2350 adalogger (#2907)
* add new RP2350 Metro!

* lol

* fruity!

* Define HSTX pins on Adafruit boards with HSTX or DVI connectors

* fixname

* update rp2350b for fruit jam

* add rp2350 adalogger (#9)

adding rp2350 adalogger

* update psram in makeboards

* Update adafruit_fruitjam.json

---------

Co-authored-by: ladyada <limor@ladyada.net>
Co-authored-by: Jeff Epler <jepler@gmail.com>
2025-04-15 10:03:21 -07:00
Liz
123ae0ff8b Update adafruit_fruitjam.json 2025-04-15 12:44:51 -04:00
Liz
0420446529 update psram in makeboards 2025-04-15 12:22:11 -04:00
Limor "Ladyada" Fried
88c717d420
Merge pull request #10 from adafruit/rp2350_adalogger
adding rp2350 adalogger
2025-04-15 11:27:54 -04:00
Earle F. Philhower, III
9ac7892bd6
Update W55RP20 example for proper CS pin (#2906)
Fixes #2903
2025-04-15 08:17:47 -07:00
Liz
407bdc93f4
add rp2350 adalogger (#9)
adding rp2350 adalogger
2025-04-15 11:08:13 -04:00
Liz
91f8872a63 update rp2350b for fruit jam 2025-04-15 10:54:57 -04:00
Liz
d938633048
Merge branch 'earlephilhower:master' into rp2350_adalogger 2025-04-15 10:49:30 -04:00
Earle F. Philhower, III
073094fe0e
Update adc.rst for RP2350B 2025-04-15 07:39:17 -07:00
Earle F. Philhower, III
2a46bcfc0f
Update contrib.rst
Update the PICO_RP2350A macro usage
2025-04-14 11:41:20 -07:00
Earle F. Philhower, III
e05dd50d62
Convert to SDK RP2350A/B determination (#2898)
* Convert to SDK RP2350A/B determination

Fixes #2878

The SDK uses `defined(PICO_RP2350) && !PICO_RP2350A` to indicate an RP2350B
chip, not the define PICO_RP2350B.

Match the SDK's usage by converting from `defined(PICO_RP2350B)` to
`defined(PICO_RP2350) && !PICO_RP2350A` and update the chip variants
accordingly.

* Need to explicitly override PICO_RP2350A for all

The *SDK*'s board definition file hardcodes a PICO_RP2350A value for
all boards, but we use the same board file for both A and B variants.
Override the SDK board definition in the variant definition file.

* Generic RP2350 needs 2-stage PICO_RP2350A setting

Also ensure SDK board definition included before pins_arduino.h for
clearing up redefinition errors.

* Factor out undef PICO_RP2350A

* Update Arduino.h
2025-04-08 16:02:54 -07:00
Earle F. Philhower, III
54885d79e0
Add explicit using arduino::IPAddress to headers (#2894)
Fix issue with WiFiNINA includes.  Fixes #2887
2025-04-07 10:17:03 -07:00
ladyada
cc96a13bed fixname 2025-03-20 13:19:38 -04:00
Limor "Ladyada" Fried
e24489b69d
Merge branch 'earlephilhower:master' into master 2025-03-20 13:16:16 -04:00
Earle F. Philhower, III
ecf2b2e39f
Add WiFi region for Pico2W (#2872)
Fixes #2871
2025-03-19 08:47:12 -07:00
Earle F. Philhower, III
49397a7f3d Update version 2025-03-18 17:03:18 -07:00
Earle F. Philhower, III
aabbba67ce
Add some Doxygen documentation to core and libraries (#2780) 2025-03-18 17:00:44 -07:00
Earle F. Philhower, III
50b9ea99bd
Add Olimex Pico2XL and Pico2XXL (#2868)
Fixes #2820
2025-03-18 16:40:51 -07:00
Earle F. Philhower, III
beece2ec9d
Add <1MB FS options for multi-size boards (#2867)
Boards with selectable flash sizes only had a 1MB FS as the smallest
option on 2MB boards.  For the normal Pico @ 2MB, though, we supported
filesystems down to 64KB.  Add those same options to the 2MB SKUs
of configurable boards.
2025-03-18 16:29:54 -07:00
Earle F. Philhower, III
1a8735700f
Use flash size menu for Olimex boards (#2866)
Remove duplicated boards with just different flash sizes.  Use the flash
size menu to select 2 or 16 MB units.
2025-03-18 15:26:34 -07:00
Earle F. Philhower, III
cc1af990b4
Add Pimoroni Servo2040 (#2865)
Fixes #2730 .  Untested, based off of schematics
2025-03-18 15:11:25 -07:00
Eris Fairbanks
0ec1dc6724
Bidirectional TDM Support (#2843)
* Initial commit.

* Works with AK4619 in TDM128 I2S compatibility mode set to rising BCLK.

* Works with I2S compat mode with BCLK mode set to 0 on AK4619.
2025-03-14 11:35:37 -07:00
Earle F. Philhower, III
15d1c6813a
Redo UF2 discovery for Windows compatibility (#2853)
Windows Python doesn't seem to kill the worker Thread properly when the IDE
is exited, leading to a) multiple Python3 instances on a PC after many uses
and b) errors updating the core when it tries to re-install Python3 while
still having the older version's EXE loaded and in use.

When an exception happens on the input() call under Windows, it seems like it
can still leave a thread running.  Add one more flag, caught in a global
exception handler.

Works around https://github.com/arduino/arduino-cli/issues/2867
2025-03-14 10:08:37 -07:00
Earle F. Philhower, III
cdf0a65d0f
Fix invalid overclock speeds 175 and 275 MHz (#2855)
Fixes #2854

Change 175->176 and 275->276 in CPU speed menu to avoid panic when
attempting to set a clock that wasn't exactly possible.
2025-03-13 20:18:50 -07:00
Earle F. Philhower, III
e60858c327 Update version 2025-03-11 13:35:52 -07:00
Earle F. Philhower, III
bebd1dff50
Update README.md (#2848) 2025-03-11 13:34:08 -07:00
Earle F. Philhower, III
14145e4469
Update to SDK 2.1.2-develop (#2844)
Supercedes #2815

Move to pico-sdk official develop branch which includes a necessary
IRQ header fix.

200MHz is now default for the Pico, but 133 is still available from
the menus.
2025-03-11 13:30:17 -07:00
Dryw Wade
d9d556bcd0
Add SparkFun XRP Controller (#2847) 2025-03-11 13:00:55 -07:00
InfiniteCoder
5bd1a3a0f6
A2DP: scanAsyncDone & scanAsyncResults; fix write and availableForWrite (#2839) 2025-03-06 10:55:56 -08:00
Earle F. Philhower, III
5bfc35caf5
Enable add'l UART_AUX pinouts for RP2350 (#2837)
Fixes #2835.  Thanks @deltaford!
2025-03-05 07:02:32 -08:00
Alex Brudner
8e1e709ab1
Add SparkFun IoT RedBoard RP2350 (#2836) 2025-03-03 16:30:42 -08:00
46a58fb4b5
Early out of (un)maskInterrupts() if no GPIO interrupts need to be masked (#2831)
My application is designed to generate HSTX data on core0 in interrupts,
but also uses hardware SPI for SD card access.

It turns out that the amount of time spent in maskInterrupts/
unmaskInterrupts, even with an empty _usingIRQs, is too long.

Add a quick check and avoid touching the interrupt disable flag if
there's not actually any GPIO interrupt to (un)mask.
2025-02-28 12:44:47 -08:00
Earle F. Philhower, III
8deb6b9724
Adjust the PSRAM clock when over/underclock F_SYS (#2824)
* Adjust the PSRAM clock when over/underclock F_SYS

Fixes #2818

* Need to increase PSRAM divider before sysclk increase

Per datasheet, when increasing sysclk speed we need to set the qmi
clocks first and do a dummy transfer to ensure no invalid speed
operations happen on the bus.  Handle the logic for this while setting
up the overclock.
2025-02-26 16:38:52 -08:00
6236d1f7c5
Define HSTX pins on Adafruit boards with HSTX or DVI connectors (#2825) 2025-02-25 08:36:58 -08:00
Dryw Wade
91ce323a68
Add SparkFun XRP Controller (Beta) (#2823) 2025-02-24 12:03:55 -08:00
Earle F. Philhower, III
2f82bfd22a
Update README.md 2025-02-23 11:36:36 -08:00
Michael Ring
1689c75ef1
Support Makerbase MKSTHR36 and MKSTHR42 Boards (#2819)
* Support Makerbase MKSTHR36 and MKSTHR42 Boards

* Added missing define for PIN_SERIAL1_* for MKSTHR42 Board
2025-02-23 11:35:53 -08:00
bd5492b6e4
Merge pull request #7 from adafruit/define-hstx-pins
Define HSTX pins on Adafruit boards with HSTX or DVI connectors
2025-02-19 10:35:14 -06:00
brabl2
935eb64a8e
Added WizNet W6100 to the AdvancedWebServer example (#2812) 2025-02-19 07:25:09 -08:00
Earle F. Philhower, III
31786cdc24 Update version 2025-02-18 12:55:03 -08:00
Earle F. Philhower, III
3d17a56ecf
Fix Wire/Wire1 definitions for Xaio RP2350 (#2811)
Fixes #2808
2025-02-18 10:28:12 -08:00
Earle F. Philhower, III
3cb5c315f3
Correct Seeed XAIO RP2350 config (#2803)
Fixes #2801
2025-02-15 16:15:29 -08:00
277 changed files with 7314 additions and 2495 deletions

View file

@ -10,7 +10,7 @@ jobs:
# Consistent style, spelling # Consistent style, spelling
astyle: astyle:
name: Spelling, Style, Boards, Package name: Spelling, Style, Boards, Package, PIO
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -19,13 +19,8 @@ jobs:
- name: Run codespell - name: Run codespell
uses: codespell-project/actions-codespell@v2 uses: codespell-project/actions-codespell@v2
with: with:
skip: ./ArduinoCore-API,./libraries/ESP8266SdFat,./libraries/Adafruit_TinyUSB_Arduino,./libraries/LittleFS/lib,./tools/pyserial,./pico-sdk,./.github,./docs/i2s.rst,./cores/rp2040/api,./libraries/FreeRTOS,./tools/libbearssl/bearssl,./include,./libraries/WiFi/examples/BearSSL_Server,./ota/uzlib,./libraries/http-parser/lib,./libraries/WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino,./libraries/HTTPUpdateServer/examples/SecureBearSSLUpdater/SecureBearSSLUpdater.ino,./.git,./libraries/FatFS/lib/fatfs,./libraries/FatFS/src/diskio.h,./libraries/FatFS/src/ff.cpp,./libraries/FatFS/src/ffconf.h,./libraries/FatFS/src/ffsystem.cpp,./libraries/FatFS/src/ff.h,./libraries/lwIP_WINC1500/src/driver,./libraries/lwIP_WINC1500/src/common,./libraries/lwIP_WINC1500/src/bus_wrapper,./libraries/lwIP_WINC1500/src/spi_flash skip: ./ArduinoCore-API,./libraries/ESP8266SdFat,./libraries/Adafruit_TinyUSB_Arduino,./libraries/LittleFS/lib,./tools/pyserial,./pico-sdk,./.github,./docs/i2s.rst,./cores/rp2040/api,./libraries/FreeRTOS,./tools/libbearssl/bearssl,./include,./libraries/WiFi/examples/BearSSL_Server,./ota/uzlib,./libraries/http-parser/lib,./libraries/WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino,./libraries/HTTPUpdateServer/examples/SecureBearSSLUpdater/SecureBearSSLUpdater.ino,./.git,./libraries/FatFS/lib/fatfs,./libraries/FatFS/src/diskio.h,./libraries/FatFS/src/ff.cpp,./libraries/FatFS/src/ffconf.h,./libraries/FatFS/src/ffsystem.cpp,./libraries/FatFS/src/ff.h,./libraries/lwIP_WINC1500/src/driver,./libraries/lwIP_WINC1500/src/common,./libraries/lwIP_WINC1500/src/bus_wrapper,./libraries/lwIP_WINC1500/src/spi_flash,./libraries/WiFi/examples/BearSSL_Validation/certs.h
ignore_words_list: ser,dout,shiftIn,acount,froms ignore_words_list: ser,dout,shiftIn,acount,froms
- name: Get submodules for following tests
run: git submodule update --init
- name: Check package references
run: |
./tests/ci/pkgrefs_test.sh
- name: Check boards.txt was not edited after makeboards.py - name: Check boards.txt was not edited after makeboards.py
run: | run: |
./tools/makeboards.py ./tools/makeboards.py
@ -38,6 +33,15 @@ jobs:
./tests/restyle.sh ./tests/restyle.sh
# If anything changed, GIT should return an error and fail the test # If anything changed, GIT should return an error and fail the test
git diff --exit-code git diff --exit-code
- name: Check compiled PIO files
run: |
(cd ./tools && ./get.py)
./tools/makepio.py
# If anything changed, GIT should return an error and fail the test
git diff -w --exit-code
- name: Check package references
run: |
./tests/ci/pkgrefs_test.sh
# Build all examples on linux (core and Arduino IDE) # Build all examples on linux (core and Arduino IDE)
build-linux: build-linux:
@ -264,8 +268,8 @@ jobs:
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install --upgrade platformio pip install --upgrade platformio
rm -rf ~/.platformio/platforms/raspberrypi*
pio pkg install --global --platform https://github.com/maxgerhardt/platform-raspberrypi.git pio pkg install --global --platform https://github.com/maxgerhardt/platform-raspberrypi.git
pio pkg update --global --platform https://github.com/maxgerhardt/platform-raspberrypi.git
pio pkg install --global --tool symlink://. pio pkg install --global --tool symlink://.
cp -f /home/runner/work/arduino-pico/arduino-pico/tools/json/*.json /home/runner/.platformio/platforms/raspberrypi/boards/. cp -f /home/runner/work/arduino-pico/arduino-pico/tools/json/*.json /home/runner/.platformio/platforms/raspberrypi/boards/.
- name: Build Multicore Example - name: Build Multicore Example
@ -321,8 +325,8 @@ jobs:
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install --upgrade platformio pip install --upgrade platformio
rm -rf ~/.platformio/platforms/raspberrypi*
pio pkg install --global --platform https://github.com/maxgerhardt/platform-raspberrypi.git pio pkg install --global --platform https://github.com/maxgerhardt/platform-raspberrypi.git
pio pkg update --global --platform https://github.com/maxgerhardt/platform-raspberrypi.git
pio pkg install --global --tool symlink://. pio pkg install --global --tool symlink://.
cp -f /home/runner/work/arduino-pico/arduino-pico/tools/json/*.json /home/runner/.platformio/platforms/raspberrypi/boards/. cp -f /home/runner/work/arduino-pico/arduino-pico/tools/json/*.json /home/runner/.platformio/platforms/raspberrypi/boards/.
- name: Build Every Variant - name: Build Every Variant

5
.gitignore vendored
View file

@ -5,5 +5,8 @@ docs/_build
ota/build ota/build
ota/build-rp2350 ota/build-rp2350
ota/build-rp2350-riscv ota/build-rp2350-riscv
tools/libpico/build tools/libpico/boot
tools/libpico/build-rp2040
tools/libpico/build-rp2350
tools/libpico/build-rp2350-riscv
platform.local.txt platform.local.txt

View file

@ -69,16 +69,21 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
* Melopero Cookie RP2040 * Melopero Cookie RP2040
* Melopero Shake RP2040 * Melopero Shake RP2040
* METE HOCA Akana R1 * METE HOCA Akana R1
* Makerbase MKSTHR36
* Makerbase MKSTHR42
* MyMakers RP2040 * MyMakers RP2040
* Neko Systems BL2040 Mini * Neko Systems BL2040 Mini
* Newsan Archi * Newsan Archi
* nullbits Bit-C PRO * nullbits Bit-C PRO
* Olimex Pico2XL
* Olimex Pico2XXL
* Olimex RP2040-Pico30 * Olimex RP2040-Pico30
* Pimoroni PGA2040 * Pimoroni PGA2040
* Pimoroni Pico Plus 2 * Pimoroni Pico Plus 2
* Pimoroni Pico Plus 2W * Pimoroni Pico Plus 2W
* Pimoroni Plasma2040 * Pimoroni Plasma2040
* Pimoroni Plasma2350 * Pimoroni Plasma2350
* Pimoroni Servo2040
* Pimoroni Tiny2040 * Pimoroni Tiny2040
* Pimoroni Tiny2350 * Pimoroni Tiny2350
* Pintronix PinMax * Pintronix PinMax
@ -93,11 +98,13 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
* Solder Party RP2040 Stamp * Solder Party RP2040 Stamp
* Solder Party RP2350 Stamp * Solder Party RP2350 Stamp
* Solder Party RP2350 Stamp XL * Solder Party RP2350 Stamp XL
* SparkFun IoT RedBoard RP2350
* SparkFun MicroMod RP2040 * SparkFun MicroMod RP2040
* SparkFun ProMicro RP2040 * SparkFun ProMicro RP2040
* SparkFun ProMicro RP2350 * SparkFun ProMicro RP2350
* SparkFun Thing Plus RP2040 * SparkFun Thing Plus RP2040
* SparkFun Thing Plus RP2350 * SparkFun Thing Plus RP2350
* SparkFun XRP Controller
* uPesy RP2040 DevKit * uPesy RP2040 DevKit
* VCC-GND YD-RP2040 * VCC-GND YD-RP2040
* Viyalab Mizu RP2040 * Viyalab Mizu RP2040

5851
boards.txt

File diff suppressed because it is too large Load diff

View file

@ -27,10 +27,23 @@
#include "RP2040Version.h" #include "RP2040Version.h"
#include "api/ArduinoAPI.h" #include "api/ArduinoAPI.h"
#include "api/itoa.h" // ARM toolchain doesn't provide itoa etc, provide them #include "api/itoa.h" // ARM toolchain doesn't provide itoa etc, provide them
#include <pico.h>
#undef PICO_RP2350A // Set in the RP2350 SDK boards file, overridden in the variant pins_arduino.h
#include <pins_arduino.h> #include <pins_arduino.h>
#include <hardware/gpio.h> // Required for the port*Register macros #include <hardware/gpio.h> // Required for the port*Register macros
#include "debug_internal.h" #include "debug_internal.h"
// Chip sanity checking. SDK uses interesting way of separating 2350A from 2350B, see https://github.com/raspberrypi/pico-sdk/issues/2364
#if (!defined(PICO_RP2040) && !defined(PICO_RP2350)) || defined(PICO_RP2040) && defined(PICO_RP2350)
#error Invalid core definition. Either PICO_RP2040 or PICO_RP2350 must be defined.
#endif
#if defined(PICO_RP2350) && !defined(PICO_RP2350A)
#error Invalid RP2350 definition. Need to set PICO_RP2350A=0/1 for A/B variant
#endif
#if defined(PICO_RP2350B)
#error Do not define PICO_RP2350B. Use PICO_RP2350A=0 to indicate RP2350B. See the SDK for more details
#endif
// Try and make the best of the old Arduino abs() macro. When in C++, use // Try and make the best of the old Arduino abs() macro. When in C++, use
// the sane std::abs() call, but for C code use their macro since stdlib abs() // the sane std::abs() call, but for C code use their macro since stdlib abs()
// is int but their macro "works" for everything (with potential side effects) // is int but their macro "works" for everything (with potential side effects)
@ -152,7 +165,7 @@ constexpr uint64_t __bitset(const int (&a)[N], size_t i = 0U) {
#define PSRAM __attribute__((section("\".psram\""))) #define PSRAM __attribute__((section("\".psram\"")))
// General GPIO/ADC layout info // General GPIO/ADC layout info
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A
#define __GPIOCNT 48 #define __GPIOCNT 48
#define __FIRSTANALOGGPIO 40 #define __FIRSTANALOGGPIO 40
#else #else

View file

@ -20,10 +20,21 @@
#pragma once #pragma once
/**
@brief Wrapper class for polling the BOOTSEL button
*/
class __Bootsel { class __Bootsel {
public: public:
__Bootsel() { } __Bootsel() { }
/**
@brief Get state of the BOOTSEL pin
@returns True if BOOTSEL pushed
*/
operator bool(); operator bool();
}; };
/**
@brief BOOTSEL accessor instance
*/
extern __Bootsel BOOTSEL; extern __Bootsel BOOTSEL;

View file

@ -1 +1,2 @@
#include "api/IPAddress.h" #include "api/IPAddress.h"
using arduino::IPAddress;

View file

@ -53,16 +53,6 @@ bool PIOProgram::prepare(PIO *pio, int *sm, int *offset, int start, int cnt) {
CoreMutex m(&_pioMutex); CoreMutex m(&_pioMutex);
PIO pi[PIOCNT] = { PIOS }; PIO pi[PIOCNT] = { PIOS };
#if 0
uint usm;
uint uoff;
auto ret = pio_claim_free_sm_and_add_program_for_gpio_range(_pgm, pio, &usm, &uoff, start, cnt, true);
*sm = usm;
*offset = uoff;
DEBUGV("clain %d\n", ret);
return ret;
#endif
uint gpioBaseNeeded = ((start + cnt) >= 32) ? 16 : 0; uint gpioBaseNeeded = ((start + cnt) >= 32) ? 16 : 0;
DEBUGV("PIOProgram %p: Searching for base=%d, pins %d-%d\n", _pgm, gpioBaseNeeded, start, start + cnt - 1); DEBUGV("PIOProgram %p: Searching for base=%d, pins %d-%d\n", _pgm, gpioBaseNeeded, start, start + cnt - 1);

View file

@ -182,13 +182,16 @@ extern "C" void loop1() __attribute__((weak));
extern "C" bool core1_separate_stack; extern "C" bool core1_separate_stack;
extern "C" uint32_t* core1_separate_stack_address; extern "C" uint32_t* core1_separate_stack_address;
/**
@brief RP2040/RP2350 helper function for HW-specific features
*/
class RP2040 { class RP2040 {
public: public:
RP2040() { /* noop */ } RP2040() { /* noop */ }
~RP2040() { /* noop */ } ~RP2040() { /* noop */ }
void begin() { void begin(int cpuid) {
_epoch = 0; _epoch[cpuid] = 0;
#if !defined(__riscv) && !defined(__PROFILE) #if !defined(__riscv) && !defined(__PROFILE)
if (!__isFreeRTOS) { if (!__isFreeRTOS) {
// Enable SYSTICK exception // Enable SYSTICK exception
@ -197,43 +200,70 @@ public:
systick_hw->rvr = 0x00FFFFFF; systick_hw->rvr = 0x00FFFFFF;
} else { } else {
#endif #endif
int off = 0; // Only start 1 instance of the PIO SM
_ccountPgm = new PIOProgram(&ccount_program); if (cpuid == 0) {
_ccountPgm->prepare(&_pio, &_sm, &off); int off = 0;
ccount_program_init(_pio, _sm, off); _ccountPgm = new PIOProgram(&ccount_program);
pio_sm_set_enabled(_pio, _sm, true); _ccountPgm->prepare(&_pio, &_sm, &off);
ccount_program_init(_pio, _sm, off);
pio_sm_set_enabled(_pio, _sm, true);
}
#if !defined(__riscv) && !defined(__PROFILE) #if !defined(__riscv) && !defined(__PROFILE)
} }
#endif #endif
} }
// Convert from microseconds to PIO clock cycles /**
@brief Convert from microseconds to PIO clock cycles
@returns the PIO cycles for a given microsecond delay
*/
static int usToPIOCycles(int us) { static int usToPIOCycles(int us) {
// Parenthesis needed to guarantee order of operations to avoid 32bit overflow // Parenthesis needed to guarantee order of operations to avoid 32bit overflow
return (us * (clock_get_hz(clk_sys) / 1'000'000)); return (us * (clock_get_hz(clk_sys) / 1'000'000));
} }
// Get current clock frequency /**
@brief Gets the active CPU speed (may differ from F_CPU
@returns CPU frequency in Hz
*/
static int f_cpu() { static int f_cpu() {
return clock_get_hz(clk_sys); return clock_get_hz(clk_sys);
} }
// Get current CPU core number /**
@brief Get the core ID that is currently executing this code
@returns 0 for Core 0, 1 for Core 1
*/
static int cpuid() { static int cpuid() {
return sio_hw->cpuid; return sio_hw->cpuid;
} }
// Get CPU cycle count. Needs to do magic to extens 24b HW to something longer /**
volatile uint64_t _epoch = 0; @brief CPU cycle counter epoch (24-bit cycle). For internal use
*/
volatile uint64_t _epoch[2] = {};
/**
@brief Get the count of CPU clock cycles since power on.
@details
The 32-bit count will overflow every 4 billion cycles, so consider using ``getCycleCount64`` for
longer measurements
@returns CPU clock cycles since power up
*/
inline uint32_t getCycleCount() { inline uint32_t getCycleCount() {
#if !defined(__riscv) && !defined(__PROFILE) #if !defined(__riscv) && !defined(__PROFILE)
// Get CPU cycle count. Needs to do magic to extend 24b HW to something longer
if (!__isFreeRTOS) { if (!__isFreeRTOS) {
uint32_t epoch; uint32_t epoch;
uint32_t ctr; uint32_t ctr;
do { do {
epoch = (uint32_t)_epoch; epoch = (uint32_t)_epoch[sio_hw->cpuid];
ctr = systick_hw->cvr; ctr = systick_hw->cvr;
} while (epoch != (uint32_t)_epoch); } while (epoch != (uint32_t)_epoch[sio_hw->cpuid]);
return epoch + (1 << 24) - ctr; /* CTR counts down from 1<<24-1 */ return epoch + (1 << 24) - ctr; /* CTR counts down from 1<<24-1 */
} else { } else {
#endif #endif
@ -242,16 +272,20 @@ public:
} }
#endif #endif
} }
/**
@brief Get the count of CPU clock cycles since power on as a 64-bit quantrity
@returns CPU clock cycles since power up
*/
inline uint64_t getCycleCount64() { inline uint64_t getCycleCount64() {
#if !defined(__riscv) && !defined(__PROFILE) #if !defined(__riscv) && !defined(__PROFILE)
if (!__isFreeRTOS) { if (!__isFreeRTOS) {
uint64_t epoch; uint64_t epoch;
uint64_t ctr; uint64_t ctr;
do { do {
epoch = _epoch; epoch = _epoch[sio_hw->cpuid];
ctr = systick_hw->cvr; ctr = systick_hw->cvr;
} while (epoch != _epoch); } while (epoch != _epoch[sio_hw->cpuid]);
return epoch + (1LL << 24) - ctr; return epoch + (1LL << 24) - ctr;
} else { } else {
#endif #endif
@ -261,23 +295,53 @@ public:
#endif #endif
} }
/**
@brief Gets total unused heap (dynamic memory)
@details
Note that the allocations of the size of the total free heap may fail due to fragmentation.
For example, ``getFreeHeap`` can report 100KB available, but an allocation of 90KB may fail
because there may not be a contiguous 90KB space available
@returns Free heap in bytes
*/
inline int getFreeHeap() { inline int getFreeHeap() {
return getTotalHeap() - getUsedHeap(); return getTotalHeap() - getUsedHeap();
} }
/**
@brief Gets total used heap (dynamic memory)
@returns Used heap in bytes
*/
inline int getUsedHeap() { inline int getUsedHeap() {
struct mallinfo m = mallinfo(); struct mallinfo m = mallinfo();
return m.uordblks; return m.uordblks;
} }
/**
@brief Gets total heap (dynamic memory) compiled into the program
@returns Total heap size in bytes
*/
inline int getTotalHeap() { inline int getTotalHeap() {
return &__StackLimit - &__bss_end__; return &__StackLimit - &__bss_end__;
} }
/**
@brief On the RP2350, returns the amount of heap (dynamic memory) available in PSRAM
@returns Total free heap in PSRAM, or 0 if no PSRAM present
*/
inline int getFreePSRAMHeap() { inline int getFreePSRAMHeap() {
return getTotalPSRAMHeap() - getUsedPSRAMHeap(); return getTotalPSRAMHeap() - getUsedPSRAMHeap();
} }
/**
@brief On the RP2350, returns the total amount of PSRAM heap (dynamic memory) used
@returns Bytes used in PSRAM, or 0 if no PSRAM present
*/
inline int getUsedPSRAMHeap() { inline int getUsedPSRAMHeap() {
#if defined(RP2350_PSRAM_CS) #if defined(RP2350_PSRAM_CS)
extern size_t __psram_total_used(); extern size_t __psram_total_used();
@ -287,6 +351,11 @@ public:
#endif #endif
} }
/**
@brief On the RP2350, gets total heap (dynamic memory) compiled into the program
@returns Total PSRAM heap size in bytes, or 0 if no PSRAM present
*/
inline int getTotalPSRAMHeap() { inline int getTotalPSRAMHeap() {
#if defined(RP2350_PSRAM_CS) #if defined(RP2350_PSRAM_CS)
extern size_t __psram_total_space(); extern size_t __psram_total_space();
@ -296,6 +365,11 @@ public:
#endif #endif
} }
/**
@brief Gets the current stack pointer in a ARM/RISC-V safe manner
@returns Current SP
*/
inline uint32_t getStackPointer() { inline uint32_t getStackPointer() {
uint32_t *sp; uint32_t *sp;
#if defined(__riscv) #if defined(__riscv)
@ -306,6 +380,14 @@ public:
return (uint32_t)sp; return (uint32_t)sp;
} }
/**
@brief Calculates approximately how much stack space is still available for the running core. Handles multiprocessing and separate stacks.
@details
Not valid in FreeRTOS. Use the FreeRTOS internal functions to access this information.
@returns Approximation of the amount of stack available for use on the specific core
*/
inline int getFreeStack() { inline int getFreeStack() {
const unsigned int sp = getStackPointer(); const unsigned int sp = getStackPointer();
uint32_t ref = 0x20040000; uint32_t ref = 0x20040000;
@ -319,6 +401,11 @@ public:
return sp - ref; return sp - ref;
} }
/**
@brief On the RP2350, gets the size of attached PSRAM
@returns PSRAM size in bytes, or 0 if no PSRAM present
*/
inline size_t getPSRAMSize() { inline size_t getPSRAMSize() {
#if defined(RP2350_PSRAM_CS) #if defined(RP2350_PSRAM_CS)
extern size_t __psram_size; extern size_t __psram_size;
@ -328,20 +415,48 @@ public:
#endif #endif
} }
/**
@brief Freezes the other core in a flash-write-safe state. Not generally needed by applications
@details
When the external flash chip is erasing or writing, the Pico cannot fetch instructions from it.
In this case both the core doing the writing and the other core (if active) need to run from a
routine that's contained in RAM. This call forces the other core into a tight, RAM-based loop
safe for this operation. When flash erase/write is completed, ``resumeOtherCore`` to return
it to operation.
Be sure to disable any interrupts or task switches before calling to avoid deadlocks.
If the second core is not started, this is a no-op.
*/
void idleOtherCore() { void idleOtherCore() {
fifo.idleOtherCore(); fifo.idleOtherCore();
} }
/**
@brief Resumes normal operation of the other core
*/
void resumeOtherCore() { void resumeOtherCore() {
fifo.resumeOtherCore(); fifo.resumeOtherCore();
} }
/**
@brief Hard resets the 2nd core (CORE1).
@details
Because core1 will restart with the heap and global variables not in the same state as
power-on, this call may not work as desired and a full CPU reset may be necessary in
certain cases.
*/
void restartCore1() { void restartCore1() {
multicore_reset_core1(); multicore_reset_core1();
fifo.clear(); fifo.clear();
multicore_launch_core1(main1); multicore_launch_core1(main1);
} }
/**
@brief Warm-reboots the chip in normal mode
*/
void reboot() { void reboot() {
watchdog_reboot(0, 0, 10); watchdog_reboot(0, 0, 10);
while (1) { while (1) {
@ -349,10 +464,16 @@ public:
} }
} }
/**
@brief Warm-reboots the chip in normal mode
*/
inline void restart() { inline void restart() {
reboot(); reboot();
} }
/**
@brief Warm-reboots the chip into the USB bootloader mode
*/
inline void rebootToBootloader() { inline void rebootToBootloader() {
reset_usb_boot(0, 0); reset_usb_boot(0, 0);
while (1) { while (1) {
@ -364,16 +485,32 @@ public:
static void enableDoubleResetBootloader(); static void enableDoubleResetBootloader();
#endif #endif
/**
@brief Starts the hardware watchdog timer. The CPU will reset if the watchdog is not fed every delay_ms
@param [in] delay_ms Milliseconds without a wdt_reset before rebooting
*/
void wdt_begin(uint32_t delay_ms) { void wdt_begin(uint32_t delay_ms) {
watchdog_enable(delay_ms, 1); watchdog_enable(delay_ms, 1);
} }
/**
@brief Feeds the watchdog timer, resetting it for another delay_ms countdown
*/
void wdt_reset() { void wdt_reset() {
watchdog_update(); watchdog_update();
} }
/**
@brief Best-effort reasons for chip reset
*/
enum resetReason_t {UNKNOWN_RESET, PWRON_RESET, RUN_PIN_RESET, SOFT_RESET, WDT_RESET, DEBUG_RESET, GLITCH_RESET, BROWNOUT_RESET}; enum resetReason_t {UNKNOWN_RESET, PWRON_RESET, RUN_PIN_RESET, SOFT_RESET, WDT_RESET, DEBUG_RESET, GLITCH_RESET, BROWNOUT_RESET};
/**
@brief Attempts to determine the reason for the last chip reset. May not always be able to determine accurately
@returns Reason for reset
*/
resetReason_t getResetReason(void) { resetReason_t getResetReason(void) {
io_rw_32 *WD_reason_reg = (io_rw_32 *)(WATCHDOG_BASE + WATCHDOG_REASON_OFFSET); io_rw_32 *WD_reason_reg = (io_rw_32 *)(WATCHDOG_BASE + WATCHDOG_REASON_OFFSET);
@ -427,6 +564,10 @@ public:
return UNKNOWN_RESET; return UNKNOWN_RESET;
} }
/**
@brief Get unique ID string for the running board
@returns String with the unique board ID as determined by the SDK
*/
const char *getChipID() { const char *getChipID() {
static char id[2 * PICO_UNIQUE_BOARD_ID_SIZE_BYTES + 1] = { 0 }; static char id[2 * PICO_UNIQUE_BOARD_ID_SIZE_BYTES + 1] = { 0 };
if (!id[0]) { if (!id[0]) {
@ -437,6 +578,17 @@ public:
#pragma GCC push_options #pragma GCC push_options
#pragma GCC optimize ("Os") #pragma GCC optimize ("Os")
/**
@brief Perform a memcpy using a DMA engine for speed
@details
Uses the DMA to copy to and from RAM. Only works on 4-byte aligned, 4-byte multiple length
sources and destination (i.e. word-aligned, word-length). Falls back to normal memcpy otherwise.
@param [out] dest Memcpy destination, 4-byte aligned
@param [in] src Memcpy source, 4-byte aligned
@param [in] n Count in bytes to transfer (should be a multiple of 4 bytes)
*/
void *memcpyDMA(void *dest, const void *src, size_t n) { void *memcpyDMA(void *dest, const void *src, size_t n) {
// Allocate a DMA channel on 1st call, reuse it every call after // Allocate a DMA channel on 1st call, reuse it every call after
if (memcpyDMAChannel < 1) { if (memcpyDMAChannel < 1) {
@ -465,14 +617,32 @@ public:
} }
#pragma GCC pop_options #pragma GCC pop_options
// Multicore comms FIFO /**
@brief Multicore communications FIFO
*/
_MFIFO fifo; _MFIFO fifo;
/**
@brief Return a 32-bit from the hardware random number generator
@returns Random value using appropriate hardware (RP2350 has true RNG, RP2040 has a less true RNG method)
*/
uint32_t hwrand32() { uint32_t hwrand32() {
return get_rand_32(); return get_rand_32();
} }
/**
@brief Determines if code is running on a Pico or a PicoW
@details
Code compiled for the RP2040 PicoW can run on the RP2040 Pico. This call lets an application
identify if the current device is really a Pico or PicoW and handle appropriately. For
the RP2350, this runtime detection is not available and the call returns whether it was
compiled for the CYW43 WiFi driver
@returns True if running on a PicoW board with CYW43 WiFi chip.
*/
bool isPicoW() { bool isPicoW() {
#if !defined(PICO_CYW43_SUPPORTED) #if !defined(PICO_CYW43_SUPPORTED)
return false; return false;
@ -499,8 +669,8 @@ public:
private: private:
static void _SystickHandler() { static void __no_inline_not_in_flash_func(_SystickHandler)() {
rp2040._epoch += 1LL << 24; rp2040._epoch[sio_hw->cpuid] += 1LL << 24;
} }
PIO _pio; PIO _pio;
int _sm; int _sm;

View file

@ -1,5 +1,5 @@
#pragma once #pragma once
#define ARDUINO_PICO_MAJOR 4 #define ARDUINO_PICO_MAJOR 4
#define ARDUINO_PICO_MINOR 4 #define ARDUINO_PICO_MINOR 5
#define ARDUINO_PICO_REVISION 3 #define ARDUINO_PICO_REVISION 4
#define ARDUINO_PICO_VERSION_STR "4.4.3" #define ARDUINO_PICO_VERSION_STR "4.5.4"

View file

@ -24,7 +24,9 @@
// Input/output will be handled by OpenOCD // Input/output will be handled by OpenOCD
// From https://developer.arm.com/documentation/dui0471/g/Semihosting/Semihosting-operations?lang=en /**
@brief Semihosting host API opcodes, from https://developer.arm.com/documentation/dui0471/g/Semihosting/Semihosting-operations?lang=en
*/
typedef enum { typedef enum {
SEMIHOST_SYS_CLOSE = 0x02, SEMIHOST_SYS_CLOSE = 0x02,
SEMIHOST_SYS_CLOCK = 0x10, SEMIHOST_SYS_CLOCK = 0x10,
@ -52,7 +54,13 @@ typedef enum {
#ifdef __arm__ #ifdef __arm__
// From https://github.com/ErichStyger/mcuoneclipse/blob/master/Examples/MCUXpresso/FRDM-K22F/FRDM-K22F_Semihosting/source/McuSemihost.c /**
@brief Execute a semihosted request, from https://github.com/ErichStyger/mcuoneclipse/blob/master/Examples/MCUXpresso/FRDM-K22F/FRDM-K22F_Semihosting/source/McuSemihost.c
@param [in] reason Opcode to execute
@param [in] arg Any arguments for the opcode
@returns Result of operation
*/
static inline int __attribute__((always_inline)) Semihost(int reason, void *arg) { static inline int __attribute__((always_inline)) Semihost(int reason, void *arg) {
int value; int value;
__asm volatile( __asm volatile(
@ -69,7 +77,13 @@ static inline int __attribute__((always_inline)) Semihost(int reason, void *arg)
} }
#else #else
// https://groups.google.com/a/groups.riscv.org/g/sw-dev/c/n-5VQ9PHZ4w/m/KbzH5t9MBgAJ /**
@brief Execute a semihosted request, from https://groups.google.com/a/groups.riscv.org/g/sw-dev/c/n-5VQ9PHZ4w/m/KbzH5t9MBgAJ
@param [in] reason Opcode to execute
@param [in] argPack Any arguments for the opcode
@returns Result of operation
*/
static inline int __attribute__((always_inline)) Semihost(int reason, void *argPack) { static inline int __attribute__((always_inline)) Semihost(int reason, void *argPack) {
register int value asm("a0") = reason; register int value asm("a0") = reason;
register void *ptr asm("a1") = argPack; register void *ptr asm("a1") = argPack;

View file

@ -68,13 +68,10 @@ static PIOProgram *_getRxProgram(int bits) {
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// TODO - this works, but there must be a faster/better way... static int __not_in_flash_func(_parity)(int data) {
static int _parity(int bits, int data) { data ^= data >> 4;
int p = 0; data &= 0xf;
for (int b = 0; b < bits; b++) { return (0x6996 >> data) & 1;
p ^= (data & (1 << b)) ? 1 : 0;
}
return p;
} }
// We need to cache generated SerialPIOs so we can add data to them from // We need to cache generated SerialPIOs so we can add data to them from
@ -98,20 +95,16 @@ void __not_in_flash_func(SerialPIO::_handleIRQ)() {
} }
while (!pio_sm_is_rx_fifo_empty(_rxPIO, _rxSM)) { while (!pio_sm_is_rx_fifo_empty(_rxPIO, _rxSM)) {
uint32_t decode = _rxPIO->rxf[_rxSM]; uint32_t decode = _rxPIO->rxf[_rxSM];
decode >>= 33 - _rxBits; uint32_t val = decode >> (32 - _rxBits - 1);
uint32_t val = 0;
for (int b = 0; b < _bits + 1; b++) {
val |= (decode & (1 << (b * 2))) ? 1 << b : 0;
}
if (_parity == UART_PARITY_EVEN) { if (_parity == UART_PARITY_EVEN) {
int p = ::_parity(_bits, val); int p = ::_parity(val);
int r = (val & (1 << _bits)) ? 1 : 0; int r = (val & (1 << _bits)) ? 1 : 0;
if (p != r) { if (p != r) {
// TODO - parity error // TODO - parity error
continue; continue;
} }
} else if (_parity == UART_PARITY_ODD) { } else if (_parity == UART_PARITY_ODD) {
int p = ::_parity(_bits, val); int p = ::_parity(val);
int r = (val & (1 << _bits)) ? 1 : 0; int r = (val & (1 << _bits)) ? 1 : 0;
if (p == r) { if (p == r) {
// TODO - parity error // TODO - parity error
@ -234,7 +227,7 @@ void SerialPIO::begin(unsigned long baud, uint16_t config) {
_writer = 0; _writer = 0;
_reader = 0; _reader = 0;
_rxBits = 2 * (_bits + _stop + (_parity != UART_PARITY_NONE ? 1 : 0) + 1) - 1; _rxBits = _bits + (_parity != UART_PARITY_NONE ? 1 : 0);
_rxPgm = _getRxProgram(_rxBits); _rxPgm = _getRxProgram(_rxBits);
int off; int off;
if (!_rxPgm->prepare(&_rxPIO, &_rxSM, &off, _rx, 1)) { if (!_rxPgm->prepare(&_rxPIO, &_rxSM, &off, _rx, 1)) {
@ -249,7 +242,7 @@ void SerialPIO::begin(unsigned long baud, uint16_t config) {
pio_sm_clear_fifos(_rxPIO, _rxSM); // Remove any existing data pio_sm_clear_fifos(_rxPIO, _rxSM); // Remove any existing data
// Put phase divider into OSR w/o using add'l program memory // Put phase divider into OSR w/o using add'l program memory
pio_sm_put_blocking(_rxPIO, _rxSM, clock_get_hz(clk_sys) / (_baud * 2) - 7 /* insns in PIO halfbit loop */); pio_sm_put_blocking(_rxPIO, _rxSM, clock_get_hz(clk_sys) / (_baud * 2) - 3);
pio_sm_exec(_rxPIO, _rxSM, pio_encode_pull(false, false)); pio_sm_exec(_rxPIO, _rxSM, pio_encode_pull(false, false));
// Join the TX FIFO to the RX one now that we don't need it // Join the TX FIFO to the RX one now that we don't need it
@ -378,10 +371,10 @@ size_t SerialPIO::write(uint8_t c) {
if (_parity == UART_PARITY_NONE) { if (_parity == UART_PARITY_NONE) {
val |= 7 << _bits; // Set 2 stop bits, the HW will only transmit the required number val |= 7 << _bits; // Set 2 stop bits, the HW will only transmit the required number
} else if (_parity == UART_PARITY_EVEN) { } else if (_parity == UART_PARITY_EVEN) {
val |= ::_parity(_bits, c) << _bits; val |= ::_parity(c) << _bits;
val |= 7 << (_bits + 1); val |= 7 << (_bits + 1);
} else { } else {
val |= (1 ^ ::_parity(_bits, c)) << _bits; val |= (1 ^ ::_parity(c)) << _bits;
val |= 7 << (_bits + 1); val |= 7 << (_bits + 1);
} }
val <<= 1; // Start bit = low val <<= 1; // Start bit = low

View file

@ -32,15 +32,20 @@ extern void serialEvent1() __attribute__((weak));
extern void serialEvent2() __attribute__((weak)); extern void serialEvent2() __attribute__((weak));
bool SerialUART::setRX(pin_size_t pin) { bool SerialUART::setRX(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({1, 13, 17, 29, 33, 45}) /* UART0 */, constexpr uint64_t valid[2] = { __bitset({1, 3, 13, 15, 17, 19, 29, 31, 33, 35, 45, 47}) /* UART0 */,
__bitset({5, 9, 21, 25, 37, 41}) /* UART1 */ __bitset({5, 7, 9, 11, 21, 23, 25, 27, 37, 39, 41, 43}) /* UART1 */
};
#elif defined(PICO_RP2350)
constexpr uint64_t valid[2] = { __bitset({1, 3, 13, 15, 17, 19, 29}) /* UART0 */,
__bitset({5, 7, 9, 11, 21, 23, 25, 27}) /* UART1 */
}; };
#else #else
constexpr uint64_t valid[2] = { __bitset({1, 13, 17, 29}) /* UART0 */, constexpr uint64_t valid[2] = { __bitset({1, 13, 17, 29}) /* UART0 */,
__bitset({5, 9, 21, 25}) /* UART1 */ __bitset({5, 9, 21, 25}) /* UART1 */
}; };
#endif #endif
if ((!_running) && ((1LL << pin) & valid[uart_get_index(_uart)])) { if ((!_running) && ((1LL << pin) & valid[uart_get_index(_uart)])) {
_rx = pin; _rx = pin;
return true; return true;
@ -59,9 +64,13 @@ bool SerialUART::setRX(pin_size_t pin) {
} }
bool SerialUART::setTX(pin_size_t pin) { bool SerialUART::setTX(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({0, 12, 16, 28, 32, 44}) /* UART0 */, constexpr uint64_t valid[2] = { __bitset({0, 2, 12, 14, 16, 18, 28, 30, 32, 34, 44, 46}) /* UART0 */,
__bitset({4, 8, 20, 24, 36, 40}) /* UART1 */ __bitset({4, 6, 8, 10, 20, 22, 24, 26, 36, 38, 40, 42}) /* UART1 */
};
#elif defined(PICO_RP2350)
constexpr uint64_t valid[2] = { __bitset({0, 2, 12, 14, 16, 18, 28}) /* UART0 */,
__bitset({4, 6, 8, 10, 20, 22, 24, 26}) /* UART1 */
}; };
#else #else
constexpr uint64_t valid[2] = { __bitset({0, 12, 16, 28}) /* UART0 */, constexpr uint64_t valid[2] = { __bitset({0, 12, 16, 28}) /* UART0 */,
@ -86,7 +95,7 @@ bool SerialUART::setTX(pin_size_t pin) {
} }
bool SerialUART::setRTS(pin_size_t pin) { bool SerialUART::setRTS(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({3, 15, 19, 31, 35, 47}) /* UART0 */, constexpr uint64_t valid[2] = { __bitset({3, 15, 19, 31, 35, 47}) /* UART0 */,
__bitset({7, 11, 23, 27, 39, 43}) /* UART1 */ __bitset({7, 11, 23, 27, 39, 43}) /* UART1 */
}; };
@ -113,7 +122,7 @@ bool SerialUART::setRTS(pin_size_t pin) {
} }
bool SerialUART::setCTS(pin_size_t pin) { bool SerialUART::setCTS(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({2, 14, 18, 30, 34, 46}) /* UART0 */, constexpr uint64_t valid[2] = { __bitset({2, 14, 18, 30, 34, 46}) /* UART0 */,
__bitset({6, 10, 22, 26, 38, 42}) /* UART1 */ __bitset({6, 10, 22, 26, 38, 42}) /* UART1 */
}; };
@ -170,6 +179,41 @@ SerialUART::SerialUART(uart_inst_t *uart, pin_size_t tx, pin_size_t rx, pin_size
static void _uart0IRQ(); static void _uart0IRQ();
static void _uart1IRQ(); static void _uart1IRQ();
// Does the selected TX/RX need UART_AUX function (rp2350)
static gpio_function_t __gpioFunction(int pin) {
switch (pin) {
#if defined(PICO_RP2350) && !PICO_RP2350A
case 2:
case 3:
case 6:
case 7:
case 10:
case 11:
case 14:
case 15:
case 18:
case 19:
case 22:
case 23:
case 26:
case 27:
case 30:
case 31:
case 34:
case 35:
case 38:
case 39:
case 42:
case 43:
case 46:
case 47:
return GPIO_FUNC_UART_AUX;
#endif
default:
return GPIO_FUNC_UART;
}
}
void SerialUART::begin(unsigned long baud, uint16_t config) { void SerialUART::begin(unsigned long baud, uint16_t config) {
if (_running) { if (_running) {
end(); end();
@ -180,9 +224,9 @@ void SerialUART::begin(unsigned long baud, uint16_t config) {
_fcnTx = gpio_get_function(_tx); _fcnTx = gpio_get_function(_tx);
_fcnRx = gpio_get_function(_rx); _fcnRx = gpio_get_function(_rx);
gpio_set_function(_tx, GPIO_FUNC_UART); gpio_set_function(_tx, __gpioFunction(_tx));
gpio_set_outover(_tx, _invertTX ? 1 : 0); gpio_set_outover(_tx, _invertTX ? 1 : 0);
gpio_set_function(_rx, GPIO_FUNC_UART); gpio_set_function(_rx, __gpioFunction(_rx));
gpio_set_inover(_rx, _invertRX ? 1 : 0); gpio_set_inover(_rx, _invertRX ? 1 : 0);
if (_rts != UART_PIN_NOT_DEFINED) { if (_rts != UART_PIN_NOT_DEFINED) {
_fcnRts = gpio_get_function(_rts); _fcnRts = gpio_get_function(_rts);

View file

@ -22,9 +22,18 @@
#include "SerialPIO.h" #include "SerialPIO.h"
/**
@brief Implements a UART port using PIO for input and output
*/
class SoftwareSerial : public SerialPIO { class SoftwareSerial : public SerialPIO {
public: public:
// Note the rx/tx pins are swapped in PIO vs SWSerial /**
@brief Constructs a PIO-based UART
@param [in] rx GPIO for RX pin or -1 for transmit-only
@param [in] tx GPIO for TX pin or -1 for receive-only
@param [in] invert True to invert the receive and transmit lines
*/
SoftwareSerial(pin_size_t rx, pin_size_t tx, bool invert = false) : SerialPIO(tx, rx) { SoftwareSerial(pin_size_t rx, pin_size_t tx, bool invert = false) : SerialPIO(tx, rx) {
_invert = invert; _invert = invert;
} }
@ -32,18 +41,37 @@ public:
~SoftwareSerial() { ~SoftwareSerial() {
} }
/**
@brief Starts the PIO UART
@param [in] baud Serial bit rate
*/
virtual void begin(unsigned long baud = 115200) override { virtual void begin(unsigned long baud = 115200) override {
begin(baud, SERIAL_8N1); begin(baud, SERIAL_8N1);
}; };
/**
@brief Starts the PIO UART
@param [in] baud Serial bit rate
@param [in] config Start/Stop/Len configuration (i.e. SERIAL_8N1 or SERIAL_7E2)
*/
void begin(unsigned long baud, uint16_t config) override { void begin(unsigned long baud, uint16_t config) override {
setInvertTX(_invert); setInvertTX(_invert);
setInvertRX(_invert); setInvertRX(_invert);
SerialPIO::begin(baud, config); SerialPIO::begin(baud, config);
} }
/**
@brief No-op on this core
*/
void listen() { /* noop */ } void listen() { /* noop */ }
/**
@brief No-op on this core
@returns True always
*/
bool isListening() { bool isListening() {
return true; return true;
} }

View file

@ -28,7 +28,7 @@ static const struct pio_program ccount_program = {
.instructions = ccount_program_instructions, .instructions = ccount_program_instructions,
.length = 2, .length = 2,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = ccount_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif

View file

@ -22,7 +22,11 @@
#include "RP2040USB.h" #include "RP2040USB.h"
#include <pico/stdlib.h> #include <pico/stdlib.h>
#include <pico/multicore.h> #include <pico/multicore.h>
#include <hardware/vreg.h>
#include <reent.h> #include <reent.h>
#ifdef RP2350_PSRAM_CS
#include "psram.h"
#endif
RP2040 rp2040; RP2040 rp2040;
extern "C" { extern "C" {
@ -47,9 +51,14 @@ void initVariant() { }
// Optional 2nd core setup and loop // Optional 2nd core setup and loop
bool core1_separate_stack __attribute__((weak)) = false; bool core1_separate_stack __attribute__((weak)) = false;
bool core1_disable_systick __attribute__((weak)) = false;
extern void setup1() __attribute__((weak)); extern void setup1() __attribute__((weak));
extern void loop1() __attribute__((weak)); extern void loop1() __attribute__((weak));
extern "C" void main1() { extern "C" void main1() {
if (!core1_disable_systick) {
// Don't install the SYSTICK exception handler. rp2040.getCycleCount will not work properly on core1
rp2040.begin(1);
}
rp2040.fifo.registerCore(); rp2040.fifo.registerCore();
if (setup1) { if (setup1) {
setup1(); setup1();
@ -80,9 +89,41 @@ static struct _reent *_impure_ptr1 = nullptr;
extern "C" int main() { extern "C" int main() {
#if (defined(PICO_RP2040) && (F_CPU != 125000000)) || (defined(PICO_RP2350) && (F_CPU != 150000000)) #if (defined(PICO_RP2040) && (F_CPU != 125000000)) || (defined(PICO_RP2350) && (F_CPU != 150000000))
set_sys_clock_khz(F_CPU / 1000, true);
#if defined(PICO_RP2040)
// From runtime_init_clocks() to bump up RP2040 V for 200Mhz+ operation
if ((F_CPU > 133000000) && (vreg_get_voltage() < VREG_VOLTAGE_1_15)) {
vreg_set_voltage(VREG_VOLTAGE_1_15);
// wait for voltage to settle; must use CPU cycles as TIMER is not yet clocked correctly
busy_wait_at_least_cycles((uint32_t)((SYS_CLK_VREG_VOLTAGE_AUTO_ADJUST_DELAY_US * (uint64_t)XOSC_HZ) / 1000000));
}
#endif #endif
#if defined(RP2350_PSRAM_CS) && (F_CPU > 150000000)
// Need to increase the qmi divider before upping sysclk to ensure we keep the output sck w/in legal bounds
psram_reinit_timing(F_CPU);
// Per datasheet, need to do a dummy access and memory barrier before it takes effect
extern uint8_t __psram_start__;
volatile uint8_t *x = &__psram_start__;
*x ^= 0xff;
*x ^= 0xff;
asm volatile("" ::: "memory");
#endif
set_sys_clock_khz(F_CPU / 1000, true);
#if defined(RP2350_PSRAM_CS) && (F_CPU < 150000000)
psram_reinit_timing();
// Per datasheet, need to do a dummy access and memory barrier before it takes effect
extern uint8_t __psram_start__;
volatile uint8_t *x = &__psram_start__;
*x ^= 0xff;
*x ^= 0xff;
asm volatile("" ::: "memory");
#endif
#endif // over/underclock
// Let rest of core know if we're using FreeRTOS // Let rest of core know if we're using FreeRTOS
__isFreeRTOS = initFreeRTOS ? true : false; __isFreeRTOS = initFreeRTOS ? true : false;
@ -92,7 +133,7 @@ extern "C" int main() {
_REENT_INIT_PTR(_impure_ptr1); _REENT_INIT_PTR(_impure_ptr1);
} }
rp2040.begin(); rp2040.begin(0);
initVariant(); initVariant();
@ -203,3 +244,10 @@ void hexdump(const void* mem, uint32_t len, uint8_t cols) {
} }
const String emptyString = ""; const String emptyString = "";
extern "C" void __attribute__((__noreturn__)) __wrap___stack_chk_fail() {
while (true) {
panic("*** stack smashing detected ***: terminated\n");
}
}

View file

@ -73,20 +73,25 @@ static inline void pio_tx_program_init(PIO pio, uint sm, uint offset, uint pin_t
; IN pin 0 and JMP pin are both mapped to the GPIO used as UART RX. ; IN pin 0 and JMP pin are both mapped to the GPIO used as UART RX.
start: start:
set x, 18 ; Preload bit counter...we'll shift in the start bit and stop bit, and each bit will be double-recorded (to be fixed by RP2040 code) set x, 18 ; Preload bit counter...overwritten by the app
wait 0 pin 0 ; Stall until start bit is asserted wait 0 pin 0 ; Stall until start bit is asserted
bitloop:
; Delay until 1/2 way into the bit time ; Delay until 1/2 way into the bit time
mov y, osr mov y, osr
wait_half: wait_mid_start:
jmp y-- wait_half jmp y-- wait_mid_start
; Read in the bit bitloop:
in pins, 1 ; Shift data bit into ISR mov y, osr
jmp x-- bitloop ; Loop all bits bitloop1:
jmp y-- bitloop1
push ; Stuff it and wait for next start mov y, osr
bitloop2:
jmp y-- bitloop2
in pins, 1
jmp x-- bitloop
push
% c-sdk { % c-sdk {
static inline void pio_rx_program_init(PIO pio, uint sm, uint offset, uint pin) { static inline void pio_rx_program_init(PIO pio, uint sm, uint offset, uint pin) {

View file

@ -32,7 +32,7 @@ static const struct pio_program pio_tx_program = {
.instructions = pio_tx_program_instructions, .instructions = pio_tx_program_instructions,
.length = 6, .length = 6,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_tx_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -71,7 +71,7 @@ static inline void pio_tx_program_init(PIO pio, uint sm, uint offset, uint pin_t
// ------ // // ------ //
#define pio_rx_wrap_target 0 #define pio_rx_wrap_target 0
#define pio_rx_wrap 6 #define pio_rx_wrap 10
#define pio_rx_pio_version 0 #define pio_rx_pio_version 0
static const uint16_t pio_rx_program_instructions[] = { static const uint16_t pio_rx_program_instructions[] = {
@ -80,18 +80,22 @@ static const uint16_t pio_rx_program_instructions[] = {
0x2020, // 1: wait 0 pin, 0 0x2020, // 1: wait 0 pin, 0
0xa047, // 2: mov y, osr 0xa047, // 2: mov y, osr
0x0083, // 3: jmp y--, 3 0x0083, // 3: jmp y--, 3
0x4001, // 4: in pins, 1 0xa047, // 4: mov y, osr
0x0042, // 5: jmp x--, 2 0x0085, // 5: jmp y--, 5
0x8020, // 6: push block 0xa047, // 6: mov y, osr
0x0087, // 7: jmp y--, 7
0x4001, // 8: in pins, 1
0x0044, // 9: jmp x--, 4
0x8020, // 10: push block
// .wrap // .wrap
}; };
#if !PICO_NO_HARDWARE #if !PICO_NO_HARDWARE
static const struct pio_program pio_rx_program = { static const struct pio_program pio_rx_program = {
.instructions = pio_rx_program_instructions, .instructions = pio_rx_program_instructions,
.length = 7, .length = 11,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_rx_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif

View file

@ -195,10 +195,7 @@ static size_t __no_inline_not_in_flash_func(get_psram_size)(void) {
/// ///
/// @note This function expects interrupts to be enabled on entry /// @note This function expects interrupts to be enabled on entry
static void __no_inline_not_in_flash_func(set_psram_timing)(void) { static void __no_inline_not_in_flash_func(set_psram_timing)(uint32_t sysHz) {
// Get secs / cycle for the system clock - get before disabling interrupts.
uint32_t sysHz = (uint32_t)clock_get_hz(clk_sys);
// Calculate the clock divider - goal to get clock used for PSRAM <= what // Calculate the clock divider - goal to get clock used for PSRAM <= what
// the PSRAM IC can handle - which is defined in SFE_PSRAM_MAX_SCK_HZ // the PSRAM IC can handle - which is defined in SFE_PSRAM_MAX_SCK_HZ
volatile uint8_t clockDivider = (sysHz + SFE_PSRAM_MAX_SCK_HZ - 1) / SFE_PSRAM_MAX_SCK_HZ; volatile uint8_t clockDivider = (sysHz + SFE_PSRAM_MAX_SCK_HZ - 1) / SFE_PSRAM_MAX_SCK_HZ;
@ -283,7 +280,7 @@ static void __no_inline_not_in_flash_func(runtime_init_setup_psram)(/*uint32_t p
// check our interrupts and setup the timing // check our interrupts and setup the timing
restore_interrupts(intr_stash); restore_interrupts(intr_stash);
set_psram_timing(); set_psram_timing((uint32_t)clock_get_hz(clk_sys));
// and now stash interrupts again // and now stash interrupts again
intr_stash = save_and_disable_interrupts(); intr_stash = save_and_disable_interrupts();
@ -323,8 +320,11 @@ static void __no_inline_not_in_flash_func(runtime_init_setup_psram)(/*uint32_t p
PICO_RUNTIME_INIT_FUNC_RUNTIME(runtime_init_setup_psram, PICO_RUNTIME_INIT_PSRAM); PICO_RUNTIME_INIT_FUNC_RUNTIME(runtime_init_setup_psram, PICO_RUNTIME_INIT_PSRAM);
// update timing -- used if the system clock/timing was changed. // update timing -- used if the system clock/timing was changed.
void psram_reinit_timing() { void psram_reinit_timing(uint32_t hz) {
set_psram_timing(); if (!hz) {
hz = (uint32_t)clock_get_hz(clk_sys);
}
set_psram_timing(hz);
} }
static bool __psram_heap_init() { static bool __psram_heap_init() {

View file

@ -31,7 +31,7 @@
#include <Arduino.h> #include <Arduino.h>
void psram_reinit_timing(); void psram_reinit_timing(uint32_t hz = 0);
void *__psram_malloc(size_t size); void *__psram_malloc(size_t size);
void __psram_free(void *ptr); void __psram_free(void *ptr);
void *__psram_realloc(void *ptr, size_t size); void *__psram_realloc(void *ptr, size_t size);

View file

@ -17,14 +17,14 @@
#define tone2_pio_version 0 #define tone2_pio_version 0
static const uint16_t tone2_program_instructions[] = { static const uint16_t tone2_program_instructions[] = {
// .wrap_target // .wrap_target
0x8080, // 0: pull noblock 0x8080, // 0: pull noblock
0xb827, // 1: mov x, osr side 1 0xb827, // 1: mov x, osr side 1
0xa047, // 2: mov y, osr 0xa047, // 2: mov y, osr
0x0083, // 3: jmp y--, 3 0x0083, // 3: jmp y--, 3
0xb047, // 4: mov y, osr side 0 0xb047, // 4: mov y, osr side 0
0x0085, // 5: jmp y--, 5 0x0085, // 5: jmp y--, 5
// .wrap // .wrap
}; };
#if !PICO_NO_HARDWARE #if !PICO_NO_HARDWARE

View file

@ -12,9 +12,9 @@ need to be periodically sampled to be read by applications, easily, such as:
* Light dependent resistors (LDR), etc. * Light dependent resistors (LDR), etc.
Up to 4 analog samples can be recorded by the hardware (``A0`` ... ``A3``), and all Up to 4 (or 8 in the case of the RP2350B) analog samples can be recorded by the
recording is done at 16-bit levels (but be aware that the ADC in the Pico will only hardware (``A0`` ... ``A3``), and all recording is done at 16-bit levels (but be
ever return values between 0...4095). aware that the ADC in the Pico will only ever return values between 0...4095).
The interface for the ``ADCInput`` device is very similar to the ``I2S`` input The interface for the ``ADCInput`` device is very similar to the ``I2S`` input
device, and most code can be ported simply by instantiating a ``ADCInput`` device, and most code can be ported simply by instantiating a ``ADCInput``
@ -26,11 +26,12 @@ allowed while in use.
ADC Input API ADC Input API
------------- -------------
ADCInput(pin0 [, pin1, pin2, pin3]) ADCInput(pin0 [, pin1, pin2, pin3[, pin4, pin5, pin6, pin7])
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Creates an ADC input object which will record the pins specified in the code. Creates an ADC input object which will record the pins specified in the code.
Only pins ``A0`` ... ``A3`` can be used, and they must be specified in increasing Only pins ``A0`` ... ``A3`` (``A7`` on RP2350B) can be used, and they must be
order (i.e. ``ADCInput(A0, A1);`` is valid, but ``ADCInput(A1, A0)`` is not. specified in increasing order (i.e. ``ADCInput(A0, A1);`` is valid,
but ``ADCInput(A1, A0)`` is not.
bool setBuffers(size_t buffers, size_t bufferWords) bool setBuffers(size_t buffers, size_t bufferWords)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

View file

@ -54,9 +54,9 @@ author = u'Earle F. Philhower, III'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = u'4.4.3' version = u'4.5.4'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = u'4.4.3' release = u'4.5.4'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

View file

@ -112,7 +112,7 @@ For only RP2350A variants (using the compile options, not the onboard ID registe
.. code:: cpp .. code:: cpp
#if defined(PICO_RP2350) && !defined(PICO_RP2350B) #if defined(PICO_RP2350A) && PICO_RP2350A
...RP2350A only code... ...RP2350A only code...
#endif #endif
@ -121,7 +121,7 @@ and not the chip ID register):
.. code:: cpp .. code:: cpp
#if defined(PICO_RP2350B) #if defined(PICO_RP2350A) && !PICO_RP2350A
...48-GPIO version code here ...48-GPIO version code here
#endif #endif

View file

@ -16,6 +16,25 @@ not necessarily simultaneously!).
See the ``Multicore.ino`` example in the ``rp2040`` example directory for a See the ``Multicore.ino`` example in the ``rp2040`` example directory for a
quick introduction. quick introduction.
Core 1 Operation
----------------
By default, core1 (the second core) has no non-user written code running on it.
No interrupts, exceptions, or other background processing is done (but the core
is still subject to hardware stalls due to on-die memory resource conflicts).
When flash erase or write operations (i.e. ``LittleFS`` or ``EEPROM``) are called
from core0, core1 **will** be paused.
If ``rp2040.getCycleCount`` is needed to operate on the second core, then a
periodic (once ever 16M clock cycles) ``SYSTICK`` exception will happen behind
the scenes. For extremely time-critical operations this may not be desirable
and can be disabled by defining a new ``bool`` variable to ``true`` anywhere
in your sketch:
.. code:: cpp
bool core1_disable_systick = true;
Stack Sizes Stack Sizes
----------- -----------
@ -67,6 +86,9 @@ void rp2040.restartCore1()
~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
Hard resets Core1 from Core 0 and restarts its operation from ``setup1()``. Hard resets Core1 from Core 0 and restarts its operation from ``setup1()``.
This can cause unpredictable behavior because globals and the heap
are shared between cores and not re-initialized with this call. Use with
extreme caution.
Communicating Between Cores Communicating Between Cores
--------------------------- ---------------------------

View file

@ -1,2 +1,2 @@
// Do not edit -- Automatically generated by tools/sdk/ssl/bearssl/Makefile // Do not edit -- Automatically generated by tools/sdk/ssl/bearssl/Makefile
#define BEARSSL_GIT 5b7f3d5 #define BEARSSL_GIT aca1383

View file

@ -13,7 +13,7 @@
#define PICO_SDK_VERSION_MAJOR 2 #define PICO_SDK_VERSION_MAJOR 2
#define PICO_SDK_VERSION_MINOR 1 #define PICO_SDK_VERSION_MINOR 1
#define PICO_SDK_VERSION_REVISION 0 #define PICO_SDK_VERSION_REVISION 2
#define PICO_SDK_VERSION_STRING "2.1.0" #define PICO_SDK_VERSION_STRING "2.1.2-develop"
#endif #endif

View file

@ -13,7 +13,7 @@
#define PICO_SDK_VERSION_MAJOR 2 #define PICO_SDK_VERSION_MAJOR 2
#define PICO_SDK_VERSION_MINOR 1 #define PICO_SDK_VERSION_MINOR 1
#define PICO_SDK_VERSION_REVISION 0 #define PICO_SDK_VERSION_REVISION 2
#define PICO_SDK_VERSION_STRING "2.1.0" #define PICO_SDK_VERSION_STRING "2.1.2-develop"
#endif #endif

View file

@ -54,6 +54,7 @@
-iwithprefixbefore/pico-sdk/src/rp2_common/pico_lwip/include -iwithprefixbefore/pico-sdk/src/rp2_common/pico_lwip/include
-iwithprefixbefore/pico-sdk/src/rp2_common/pico_multicore/include -iwithprefixbefore/pico-sdk/src/rp2_common/pico_multicore/include
-iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform/include -iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform/include
-iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform_common/include
-iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform_compiler/include -iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform_compiler/include
-iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform_sections/include -iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform_sections/include
-iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform_panic/include -iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform_panic/include

View file

@ -67,3 +67,5 @@
-Wl,--wrap=cyw43_tcpip_link_status -Wl,--wrap=cyw43_tcpip_link_status
-Wl,--wrap=cyw43_cb_tcpip_init -Wl,--wrap=cyw43_cb_tcpip_init
-Wl,--wrap=cyw43_cb_tcpip_deinit -Wl,--wrap=cyw43_cb_tcpip_deinit
-Wl,--wrap=__stack_chk_fail

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -10,5 +10,6 @@
-iwithprefixbefore/pico-sdk/lib/btstack/src -iwithprefixbefore/pico-sdk/lib/btstack/src
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/decoder/include -iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/decoder/include
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/encoder/include -iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/encoder/include
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/yxml
-iwithprefixbefore/pico-sdk/lib/btstack/platform/embedded -iwithprefixbefore/pico-sdk/lib/btstack/platform/embedded
-iwithprefixbefore/pico-sdk/src/rp2_common/cmsis/stub/CMSIS/Device/RP2040/Include -iwithprefixbefore/pico-sdk/src/rp2_common/cmsis/stub/CMSIS/Device/RP2040/Include

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -1,4 +1,5 @@
-DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1
-DTARGET_RP2350
-DCYW43_LWIP=1 -DCYW43_LWIP=1
-DCYW43_PIO_CLOCK_DIV_DYNAMIC=1 -DCYW43_PIO_CLOCK_DIV_DYNAMIC=1
-DCFG_TUSB_MCU=OPT_MCU_RP2040 -DCFG_TUSB_MCU=OPT_MCU_RP2040

View file

@ -15,4 +15,5 @@
-iwithprefixbefore/pico-sdk/lib/btstack/src -iwithprefixbefore/pico-sdk/lib/btstack/src
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/decoder/include -iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/decoder/include
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/encoder/include -iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/encoder/include
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/yxml
-iwithprefixbefore/pico-sdk/lib/btstack/platform/embedded -iwithprefixbefore/pico-sdk/lib/btstack/platform/embedded

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -1,4 +1,5 @@
-DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1
-DTARGET_RP2350
-DCYW43_LWIP=1 -DCYW43_LWIP=1
-DCYW43_PIO_CLOCK_DIV_DYNAMIC=1 -DCYW43_PIO_CLOCK_DIV_DYNAMIC=1
-DCFG_TUSB_MCU=OPT_MCU_RP2040 -DCFG_TUSB_MCU=OPT_MCU_RP2040

View file

@ -13,4 +13,5 @@
-iwithprefixbefore/pico-sdk/lib/btstack/src -iwithprefixbefore/pico-sdk/lib/btstack/src
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/decoder/include -iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/decoder/include
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/encoder/include -iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/encoder/include
-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/yxml
-iwithprefixbefore/pico-sdk/lib/btstack/platform/embedded -iwithprefixbefore/pico-sdk/lib/btstack/platform/embedded

View file

@ -49,12 +49,7 @@ bool ADCInput::setBuffers(size_t buffers, size_t bufferWords) {
int ADCInput::_mask(pin_size_t p) { int ADCInput::_mask(pin_size_t p) {
switch (p) { switch (p) {
#if !defined(PICO_RP2350B) #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
case 26: return 1;
case 27: return 2;
case 28: return 4;
case 29: return 8;
#else // Starts at 40 and there are 8 of them
case 40: return 1; case 40: return 1;
case 41: return 2; case 41: return 2;
case 42: return 4; case 42: return 4;
@ -63,6 +58,11 @@ int ADCInput::_mask(pin_size_t p) {
case 45: return 32; case 45: return 32;
case 46: return 64; case 46: return 64;
case 47: return 128; case 47: return 128;
#else
case 26: return 1;
case 27: return 2;
case 28: return 4;
case 29: return 8;
#endif #endif
default: return 0; default: return 0;
} }
@ -106,7 +106,7 @@ bool ADCInput::begin() {
// Set up the GPIOs to go to ADC // Set up the GPIOs to go to ADC
adc_init(); adc_init();
int cnt = 0; int cnt = 0;
#if !defined(PICO_RP2350B) #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
int startpin = 26; int startpin = 26;
int maxpin = 29; int maxpin = 29;
#else #else

@ -1 +1 @@
Subproject commit c92b7fde169fceb6b375f6f95a69412caf2d1f0f Subproject commit 6b772c0ac4a8158011a738e794463a2fe4e84a33

View file

@ -196,7 +196,7 @@ static void extract_service(gatt_client_service_t * service, uint8_t * packet) {
service->start_group_handle = little_endian_read_16(packet, 4); service->start_group_handle = little_endian_read_16(packet, 4);
service->end_group_handle = little_endian_read_16(packet, 6); service->end_group_handle = little_endian_read_16(packet, 6);
service->uuid16 = 0; service->uuid16 = 0;
reverse_128(&packet[8], service->uuid128); reverse_128(&packet[12], service->uuid128);
if (uuid_has_bluetooth_prefix(service->uuid128)) { if (uuid_has_bluetooth_prefix(service->uuid128)) {
service->uuid16 = big_endian_read_32(service->uuid128, 0); service->uuid16 = big_endian_read_32(service->uuid128, 0);
} }

View file

@ -223,7 +223,7 @@ size_t A2DPSource::write(const uint8_t *buffer, size_t size) {
size = std::min((size_t)availableForWrite(), size); size = std::min((size_t)availableForWrite(), size);
size_t count = 0; size_t count = 0;
size /= 2; size /= sizeof(int16_t); // Convert size to samples
// First copy from writer to either end of // First copy from writer to either end of
uint32_t start = _pcmWriter; uint32_t start = _pcmWriter;
@ -262,7 +262,7 @@ int A2DPSource::availableForWrite() {
} else { } else {
avail = _pcmBufferSize - _pcmWriter + _pcmReader - 1; avail = _pcmBufferSize - _pcmWriter + _pcmReader - 1;
} }
avail /= sizeof(uint32_t); // availableForWrite always 32b sample pairs in this core... avail *= sizeof(int16_t); // Convert samples to bytes
return avail; return avail;
} }

View file

@ -125,6 +125,14 @@ public:
return _hci.scan(mask, scanTimeSec, async); return _hci.scan(mask, scanTimeSec, async);
} }
bool scanAsyncDone() {
return _hci.scanAsyncDone();
}
std::vector<BTDeviceInfo> scanAsyncResult() {
return _hci.scanAsyncResult();
}
bool connect(const uint8_t *addr = nullptr); bool connect(const uint8_t *addr = nullptr);
bool connected() { bool connected() {
@ -151,6 +159,7 @@ public:
} }
// from Print (see notes on write() methods below) // from Print (see notes on write() methods below)
// Writes only full samples (size must be divisible by sample size in bytes)
virtual size_t write(const uint8_t *buffer, size_t size) override; virtual size_t write(const uint8_t *buffer, size_t size) override;
virtual int availableForWrite() override; virtual int availableForWrite() override;

View file

@ -178,7 +178,7 @@ bool I2S::setLSBJFormat() {
} }
bool I2S::setTDMFormat() { bool I2S::setTDMFormat() {
if (_running || !_isOutput || _isInput) { if (_running || !_isOutput) {
return false; return false;
} }
_isTDM = true; _isTDM = true;
@ -186,7 +186,7 @@ bool I2S::setTDMFormat() {
} }
bool I2S::setTDMChannels(int channels) { bool I2S::setTDMChannels(int channels) {
if (_running || !_isOutput || _isInput) { if (_running || !_isOutput) {
return false; return false;
} }
_tdmChannels = channels; _tdmChannels = channels;
@ -255,9 +255,9 @@ bool I2S::begin() {
_isHolding = 0; _isHolding = 0;
int off = 0; int off = 0;
if (!_swapClocks) { if (!_swapClocks) {
_i2s = new PIOProgram(_isOutput ? (_isInput ? &pio_i2s_inout_program : (_isTDM ? &pio_tdm_out_program : (_isLSBJ ? &pio_lsbj_out_program : &pio_i2s_out_program))) : &pio_i2s_in_program); _i2s = new PIOProgram(_isOutput ? (_isInput ? (_isTDM ? &pio_tdm_inout_program : &pio_i2s_inout_program) : (_isTDM ? &pio_tdm_out_program : (_isLSBJ ? &pio_lsbj_out_program : &pio_i2s_out_program))) : &pio_i2s_in_program);
} else { } else {
_i2s = new PIOProgram(_isOutput ? (_isInput ? &pio_i2s_inout_swap_program : (_isTDM ? &pio_tdm_out_swap_program : (_isLSBJ ? &pio_lsbj_out_swap_program : &pio_i2s_out_swap_program))) : &pio_i2s_in_swap_program); _i2s = new PIOProgram(_isOutput ? (_isInput ? (_isTDM ? &pio_tdm_inout_swap_program : &pio_i2s_inout_swap_program) : (_isTDM ? &pio_tdm_out_swap_program : (_isLSBJ ? &pio_lsbj_out_swap_program : &pio_i2s_out_swap_program))) : &pio_i2s_in_swap_program);
} }
int minpin, maxpin; int minpin, maxpin;
if (_isOutput && _isInput) { if (_isOutput && _isInput) {
@ -278,7 +278,11 @@ bool I2S::begin() {
} }
if (_isOutput) { if (_isOutput) {
if (_isInput) { if (_isInput) {
pio_i2s_inout_program_init(_pio, _sm, off, _pinDIN, _pinDOUT, _pinBCLK, _bps, _swapClocks); if (_isTDM) {
pio_tdm_inout_program_init(_pio, _sm, off, _pinDIN, _pinDOUT, _pinBCLK, _bps, _swapClocks, _tdmChannels);
} else {
pio_i2s_inout_program_init(_pio, _sm, off, _pinDIN, _pinDOUT, _pinBCLK, _bps, _swapClocks);
}
} else if (_isTDM) { } else if (_isTDM) {
pio_tdm_out_program_init(_pio, _sm, off, _pinDOUT, _pinBCLK, _bps, _swapClocks, _tdmChannels); pio_tdm_out_program_init(_pio, _sm, off, _pinDOUT, _pinBCLK, _bps, _swapClocks, _tdmChannels);
} else if (_isLSBJ) { } else if (_isLSBJ) {

View file

@ -104,6 +104,41 @@ lastbit:
; Loop back to the beginning ; Loop back to the beginning
.program pio_tdm_inout
.side_set 2 ; 0 = bclk, 1 = wclk
; The C code should place (number of bits * channels - 1) in Y and update SHIFTCTRL
; to be 32 (as per the TDM specs)
; +----- WCLK
; |+---- BCLK
mov x, y side 0b01 [1]
bitloop:
out pins, 1 side 0b00 ; Output changes on falling edge
in pins, 1 side 0b00 ; Sample input on falling edge
jmp x-- bitloop side 0b11 [1] ; Last bit toggles WCLK to mark frame boundary
lastbit:
in pins, 1 side 0b10
out pins, 1 side 0b10
; Loop back to the beginning
.program pio_tdm_inout_swap
.side_set 2 ; 0 = bclk, 1 = wclk
; The C code should place (number of bits * channels - 1) in Y and update SHIFTCTRL
; to be 32 (as per the TDM specs)
; +----- WCLK
; |+---- BCLK
mov x, y side 0b10 [1]
bitloop:
out pins, 1 side 0b00 ; Output changes on falling edge
in pins, 1 side 0b00 ; Sample input on falling edge
jmp x-- bitloop side 0b11 [1] ; Last bit toggles WCLK to mark frame boundary
lastbit:
in pins, 1 side 0b01
out pins, 1 side 0b01
; Loop back to the beginning
.program pio_lsbj_out .program pio_lsbj_out
.side_set 2 ; 0 = bclk, 1=wclk .side_set 2 ; 0 = bclk, 1=wclk
@ -313,6 +348,42 @@ static inline void pio_tdm_out_program_init(PIO pio, uint sm, uint offset, uint
pio_sm_exec(pio, sm, pio_encode_out(pio_osr, 32)); pio_sm_exec(pio, sm, pio_encode_out(pio_osr, 32));
} }
static inline void pio_tdm_inout_program_init(PIO pio, uint sm, uint offset, uint data_in_pin, uint data_out_pin, uint clock_pin_base, uint bits, bool swap, uint channels) {
pio_gpio_init(pio, data_in_pin);
pio_gpio_init(pio, data_out_pin);
pio_gpio_init(pio, clock_pin_base);
pio_gpio_init(pio, clock_pin_base + 1);
pio_sm_config c = swap ? pio_tdm_inout_swap_program_get_default_config(offset) : pio_tdm_inout_program_get_default_config(offset);
sm_config_set_in_pins(&c, data_in_pin);
sm_config_set_out_pins(&c, data_out_pin, 1);
sm_config_set_sideset_pins(&c, clock_pin_base);
sm_config_set_in_shift(&c, false, true, 32);
sm_config_set_out_shift(&c, false, true, 32);
sm_config_set_fifo_join(&c, PIO_FIFO_JOIN_NONE);
pio_sm_init(pio, sm, offset, &c);
pio_sm_set_consecutive_pindirs(pio, sm, data_in_pin, 1, false);
pio_sm_set_consecutive_pindirs(pio, sm, data_out_pin, 1, true);
pio_sm_set_consecutive_pindirs(pio, sm, clock_pin_base, 2, true);
pio_sm_set_set_pins(pio, sm, data_out_pin, 1);
pio_sm_set_set_pins(pio, sm, clock_pin_base, 2);
// Initialize PIO state for TDM
// Can't set constant > 31, so push and pop/mov if needed
if (bits * channels - 1 > 31) {
pio_sm_put_blocking(pio, sm, bits * channels - 2);
pio_sm_exec(pio, sm, pio_encode_pull(false, false));
pio_sm_exec(pio, sm, pio_encode_mov(pio_y, pio_osr));
} else {
pio_sm_exec(pio, sm, pio_encode_set(pio_y, bits * channels - 2));
}
// Need to make OSR believe there's nothing left to shift out
pio_sm_exec(pio, sm, pio_encode_out(pio_osr, 32));
}
static inline void pio_lsbj_out_program_init(PIO pio, uint sm, uint offset, uint data_pin, uint clock_pin_base, uint bits, bool swap) { static inline void pio_lsbj_out_program_init(PIO pio, uint sm, uint offset, uint data_pin, uint clock_pin_base, uint bits, bool swap) {
pio_gpio_init(pio, data_pin); pio_gpio_init(pio, data_pin);

View file

@ -28,7 +28,7 @@ static const struct pio_program pio_i2s_mclk_program = {
.instructions = pio_i2s_mclk_program_instructions, .instructions = pio_i2s_mclk_program_instructions,
.length = 2, .length = 2,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_i2s_mclk_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -67,7 +67,7 @@ static const struct pio_program pio_i2s_out_program = {
.instructions = pio_i2s_out_program_instructions, .instructions = pio_i2s_out_program_instructions,
.length = 8, .length = 8,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_i2s_out_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -107,7 +107,7 @@ static const struct pio_program pio_i2s_out_swap_program = {
.instructions = pio_i2s_out_swap_program_instructions, .instructions = pio_i2s_out_swap_program_instructions,
.length = 8, .length = 8,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_i2s_out_swap_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -143,7 +143,7 @@ static const struct pio_program pio_tdm_out_program = {
.instructions = pio_tdm_out_program_instructions, .instructions = pio_tdm_out_program_instructions,
.length = 4, .length = 4,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_tdm_out_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -179,7 +179,7 @@ static const struct pio_program pio_tdm_out_swap_program = {
.instructions = pio_tdm_out_swap_program_instructions, .instructions = pio_tdm_out_swap_program_instructions,
.length = 4, .length = 4,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_tdm_out_swap_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -193,6 +193,82 @@ static inline pio_sm_config pio_tdm_out_swap_program_get_default_config(uint off
} }
#endif #endif
// ------------- //
// pio_tdm_inout //
// ------------- //
#define pio_tdm_inout_wrap_target 0
#define pio_tdm_inout_wrap 5
#define pio_tdm_inout_pio_version 0
static const uint16_t pio_tdm_inout_program_instructions[] = {
// .wrap_target
0xa922, // 0: mov x, y side 1 [1]
0x6001, // 1: out pins, 1 side 0
0x4001, // 2: in pins, 1 side 0
0x1941, // 3: jmp x--, 1 side 3 [1]
0x5001, // 4: in pins, 1 side 2
0x7001, // 5: out pins, 1 side 2
// .wrap
};
#if !PICO_NO_HARDWARE
static const struct pio_program pio_tdm_inout_program = {
.instructions = pio_tdm_inout_program_instructions,
.length = 6,
.origin = -1,
.pio_version = pio_tdm_inout_pio_version,
#if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0
#endif
};
static inline pio_sm_config pio_tdm_inout_program_get_default_config(uint offset) {
pio_sm_config c = pio_get_default_sm_config();
sm_config_set_wrap(&c, offset + pio_tdm_inout_wrap_target, offset + pio_tdm_inout_wrap);
sm_config_set_sideset(&c, 2, false, false);
return c;
}
#endif
// ------------------ //
// pio_tdm_inout_swap //
// ------------------ //
#define pio_tdm_inout_swap_wrap_target 0
#define pio_tdm_inout_swap_wrap 5
#define pio_tdm_inout_swap_pio_version 0
static const uint16_t pio_tdm_inout_swap_program_instructions[] = {
// .wrap_target
0xb122, // 0: mov x, y side 2 [1]
0x6001, // 1: out pins, 1 side 0
0x4001, // 2: in pins, 1 side 0
0x1941, // 3: jmp x--, 1 side 3 [1]
0x4801, // 4: in pins, 1 side 1
0x6801, // 5: out pins, 1 side 1
// .wrap
};
#if !PICO_NO_HARDWARE
static const struct pio_program pio_tdm_inout_swap_program = {
.instructions = pio_tdm_inout_swap_program_instructions,
.length = 6,
.origin = -1,
.pio_version = pio_tdm_inout_swap_pio_version,
#if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0
#endif
};
static inline pio_sm_config pio_tdm_inout_swap_program_get_default_config(uint offset) {
pio_sm_config c = pio_get_default_sm_config();
sm_config_set_wrap(&c, offset + pio_tdm_inout_swap_wrap_target, offset + pio_tdm_inout_swap_wrap);
sm_config_set_sideset(&c, 2, false, false);
return c;
}
#endif
// ------------ // // ------------ //
// pio_lsbj_out // // pio_lsbj_out //
// ------------ // // ------------ //
@ -219,7 +295,7 @@ static const struct pio_program pio_lsbj_out_program = {
.instructions = pio_lsbj_out_program_instructions, .instructions = pio_lsbj_out_program_instructions,
.length = 8, .length = 8,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_lsbj_out_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -259,7 +335,7 @@ static const struct pio_program pio_lsbj_out_swap_program = {
.instructions = pio_lsbj_out_swap_program_instructions, .instructions = pio_lsbj_out_swap_program_instructions,
.length = 8, .length = 8,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_lsbj_out_swap_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -299,7 +375,7 @@ static const struct pio_program pio_i2s_in_program = {
.instructions = pio_i2s_in_program_instructions, .instructions = pio_i2s_in_program_instructions,
.length = 8, .length = 8,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_i2s_in_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -339,7 +415,7 @@ static const struct pio_program pio_i2s_in_swap_program = {
.instructions = pio_i2s_in_swap_program_instructions, .instructions = pio_i2s_in_swap_program_instructions,
.length = 8, .length = 8,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_i2s_in_swap_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -383,7 +459,7 @@ static const struct pio_program pio_i2s_inout_program = {
.instructions = pio_i2s_inout_program_instructions, .instructions = pio_i2s_inout_program_instructions,
.length = 12, .length = 12,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_i2s_inout_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -427,7 +503,7 @@ static const struct pio_program pio_i2s_inout_swap_program = {
.instructions = pio_i2s_inout_swap_program_instructions, .instructions = pio_i2s_inout_swap_program_instructions,
.length = 12, .length = 12,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pio_i2s_inout_swap_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -490,6 +566,36 @@ static inline void pio_tdm_out_program_init(PIO pio, uint sm, uint offset, uint
// Need to make OSR believe there's nothing left to shift out, or the 1st word will be the count we just passed in, not a sample // Need to make OSR believe there's nothing left to shift out, or the 1st word will be the count we just passed in, not a sample
pio_sm_exec(pio, sm, pio_encode_out(pio_osr, 32)); pio_sm_exec(pio, sm, pio_encode_out(pio_osr, 32));
} }
static inline void pio_tdm_inout_program_init(PIO pio, uint sm, uint offset, uint data_in_pin, uint data_out_pin, uint clock_pin_base, uint bits, bool swap, uint channels) {
pio_gpio_init(pio, data_in_pin);
pio_gpio_init(pio, data_out_pin);
pio_gpio_init(pio, clock_pin_base);
pio_gpio_init(pio, clock_pin_base + 1);
pio_sm_config c = swap ? pio_tdm_inout_swap_program_get_default_config(offset) : pio_tdm_inout_program_get_default_config(offset);
sm_config_set_in_pins(&c, data_in_pin);
sm_config_set_out_pins(&c, data_out_pin, 1);
sm_config_set_sideset_pins(&c, clock_pin_base);
sm_config_set_in_shift(&c, false, true, 32);
sm_config_set_out_shift(&c, false, true, 32);
sm_config_set_fifo_join(&c, PIO_FIFO_JOIN_NONE);
pio_sm_init(pio, sm, offset, &c);
pio_sm_set_consecutive_pindirs(pio, sm, data_in_pin, 1, false);
pio_sm_set_consecutive_pindirs(pio, sm, data_out_pin, 1, true);
pio_sm_set_consecutive_pindirs(pio, sm, clock_pin_base, 2, true);
pio_sm_set_set_pins(pio, sm, data_out_pin, 1);
pio_sm_set_set_pins(pio, sm, clock_pin_base, 2);
// Initialize PIO state for TDM
// Can't set constant > 31, so push and pop/mov if needed
if (bits * channels - 1 > 31) {
pio_sm_put_blocking(pio, sm, bits * channels - 2);
pio_sm_exec(pio, sm, pio_encode_pull(false, false));
pio_sm_exec(pio, sm, pio_encode_mov(pio_y, pio_osr));
} else {
pio_sm_exec(pio, sm, pio_encode_set(pio_y, bits * channels - 2));
}
// Need to make OSR believe there's nothing left to shift out
pio_sm_exec(pio, sm, pio_encode_out(pio_osr, 32));
}
static inline void pio_lsbj_out_program_init(PIO pio, uint sm, uint offset, uint data_pin, uint clock_pin_base, uint bits, bool swap) { static inline void pio_lsbj_out_program_init(PIO pio, uint sm, uint offset, uint data_pin, uint clock_pin_base, uint bits, bool swap) {
pio_gpio_init(pio, data_pin); pio_gpio_init(pio, data_pin);
pio_gpio_init(pio, clock_pin_base); pio_gpio_init(pio, clock_pin_base);
@ -555,3 +661,4 @@ static inline void pio_i2s_inout_program_init(PIO pio, uint sm, uint offset, uin
} }
#endif #endif

@ -1 +1 @@
Subproject commit 0494ce7169f06a734a7bd7585f49a9fa91fa7318 Subproject commit 8ed63b27be79ab59ee1cd15a950ddd64e7a602f7

View file

@ -31,7 +31,7 @@ static inline void pdm_pio_program_init(PIO pio, uint sm, uint offset, uint clkP
pio_sm_set_consecutive_pindirs(pio, sm, dataPin, 1, false); pio_sm_set_consecutive_pindirs(pio, sm, dataPin, 1, false);
pio_sm_set_consecutive_pindirs(pio, sm, clkPin, 1, true); pio_sm_set_consecutive_pindirs(pio, sm, clkPin, 1, true);
pio_sm_set_pins_with_mask(pio, sm, 0, (1u << clkPin) ); pio_sm_set_pins_with_mask(pio, sm, 0, (1u << clkPin) );
//pio_gpio_init(pio, dataPin); pio_gpio_init(pio, dataPin);
pio_gpio_init(pio, clkPin); pio_gpio_init(pio, clkPin);
pio_sm_init(pio, sm, offset, &c); pio_sm_init(pio, sm, offset, &c);

View file

@ -28,7 +28,7 @@ static const struct pio_program pdm_pio_program = {
.instructions = pdm_pio_program_instructions, .instructions = pdm_pio_program_instructions,
.length = 2, .length = 2,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = pdm_pio_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif

View file

@ -18,8 +18,8 @@ static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 16000, 1}, {11025, 116
static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 16625, 1}, {11025, 24127, 2}, {16000, 16625, 2}, {22050, 24127, 4}, {32000, 16625, 4}, {44100, 24127, 8}, {48000, 16625, 6}, {88200, 24127, 16}, {96000, 16625, 12}, {176400, 47500, 63}, {192000, 16625, 24}}; static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 16625, 1}, {11025, 24127, 2}, {16000, 16625, 2}, {22050, 24127, 4}, {32000, 16625, 4}, {44100, 24127, 8}, {48000, 16625, 6}, {88200, 24127, 16}, {96000, 16625, 12}, {176400, 47500, 63}, {192000, 16625, 24}};
#elif F_CPU == 150000000 #elif F_CPU == 150000000
static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 18750, 1}, {11025, 27211, 2}, {16000, 9375, 1}, {22050, 47619, 7}, {32000, 9375, 2}, {44100, 37415, 11}, {48000, 3125, 1}, {88200, 42517, 25}, {96000, 3125, 2}, {176400, 42517, 50}, {192000, 3125, 4}}; static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 18750, 1}, {11025, 27211, 2}, {16000, 9375, 1}, {22050, 47619, 7}, {32000, 9375, 2}, {44100, 37415, 11}, {48000, 3125, 1}, {88200, 42517, 25}, {96000, 3125, 2}, {176400, 42517, 50}, {192000, 3125, 4}};
#elif F_CPU == 175000000 #elif F_CPU == 176000000
static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 21875, 1}, {11025, 15873, 1}, {16000, 21875, 2}, {22050, 15873, 2}, {32000, 21875, 4}, {44100, 15873, 4}, {48000, 21875, 6}, {88200, 15873, 8}, {96000, 21875, 12}, {176400, 62500, 63}, {192000, 21875, 24}}; static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 22000, 1}, {11025, 63855, 4}, {16000, 11000, 1}, {22050, 55873, 7}, {32000, 5500, 1}, {44100, 55873, 14}, {48000, 11000, 3}, {88200, 55873, 28}, {96000, 5500, 3}, {176400, 55873, 56}, {192000, 2750, 3}};
#elif F_CPU == 200000000 #elif F_CPU == 200000000
static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 25000, 1}, {11025, 54422, 3}, {16000, 12500, 1}, {22050, 63492, 7}, {32000, 6250, 1}, {44100, 31746, 7}, {48000, 12500, 3}, {88200, 15873, 7}, {96000, 6250, 3}, {176400, 53288, 47}, {192000, 3125, 3}}; static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 25000, 1}, {11025, 54422, 3}, {16000, 12500, 1}, {22050, 63492, 7}, {32000, 6250, 1}, {44100, 31746, 7}, {48000, 12500, 3}, {88200, 15873, 7}, {96000, 6250, 3}, {176400, 53288, 47}, {192000, 3125, 3}};
#elif F_CPU == 225000000 #elif F_CPU == 225000000
@ -28,8 +28,8 @@ static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 28125, 1}, {11025, 204
static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 30000, 1}, {11025, 65306, 3}, {16000, 15000, 1}, {22050, 32653, 3}, {32000, 7500, 1}, {44100, 59864, 11}, {48000, 5000, 1}, {88200, 62585, 23}, {96000, 2500, 1}, {176400, 62585, 46}, {192000, 1250, 1}}; static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 30000, 1}, {11025, 65306, 3}, {16000, 15000, 1}, {22050, 32653, 3}, {32000, 7500, 1}, {44100, 59864, 11}, {48000, 5000, 1}, {88200, 62585, 23}, {96000, 2500, 1}, {176400, 62585, 46}, {192000, 1250, 1}};
#elif F_CPU == 250000000 #elif F_CPU == 250000000
static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 31250, 1}, {11025, 45351, 2}, {16000, 15625, 1}, {22050, 56689, 5}, {32000, 15625, 2}, {44100, 62358, 11}, {48000, 15625, 3}, {88200, 42517, 15}, {96000, 15625, 6}, {176400, 42517, 30}, {192000, 15625, 12}}; static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 31250, 1}, {11025, 45351, 2}, {16000, 15625, 1}, {22050, 56689, 5}, {32000, 15625, 2}, {44100, 62358, 11}, {48000, 15625, 3}, {88200, 42517, 15}, {96000, 15625, 6}, {176400, 42517, 30}, {192000, 15625, 12}};
#elif F_CPU == 275000000 #elif F_CPU == 276000000
static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 34375, 1}, {11025, 49887, 2}, {16000, 34375, 2}, {22050, 37415, 3}, {32000, 34375, 4}, {44100, 37415, 6}, {48000, 34375, 6}, {88200, 37415, 12}, {96000, 34375, 12}, {176400, 35856, 23}, {192000, 34375, 24}}; static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 34500, 1}, {11025, 25034, 1}, {16000, 17250, 1}, {22050, 12517, 1}, {32000, 8625, 1}, {44100, 12517, 2}, {48000, 5750, 1}, {88200, 12517, 4}, {96000, 2875, 1}, {176400, 12517, 8}, {192000, 2875, 2}};
#elif F_CPU == 300000000 #elif F_CPU == 300000000
static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 37500, 1}, {11025, 27211, 1}, {16000, 18750, 1}, {22050, 27211, 2}, {32000, 9375, 1}, {44100, 47619, 7}, {48000, 6250, 1}, {88200, 37415, 11}, {96000, 3125, 1}, {176400, 42517, 25}, {192000, 3125, 2}}; static const PWMPacerPrecalc __PWMAudio_pacer[] = {{8000, 37500, 1}, {11025, 27211, 1}, {16000, 18750, 1}, {22050, 27211, 2}, {32000, 9375, 1}, {44100, 47619, 7}, {48000, 6250, 1}, {88200, 37415, 11}, {96000, 3125, 1}, {176400, 42517, 25}, {192000, 3125, 2}};
#else #else

View file

@ -263,8 +263,8 @@ void SPIClassRP2040::abortAsync() {
bool SPIClassRP2040::setRX(pin_size_t pin) { bool SPIClassRP2040::setRX(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({0, 4, 16, 20, 32, 26}) /* SPI0 */, constexpr uint64_t valid[2] = { __bitset({0, 4, 16, 20, 32, 36}) /* SPI0 */,
__bitset({8, 12, 24, 28, 40, 44}) /* SPI1 */ __bitset({8, 12, 24, 28, 40, 44}) /* SPI1 */
}; };
#else #else
@ -290,7 +290,7 @@ bool SPIClassRP2040::setRX(pin_size_t pin) {
} }
bool SPIClassRP2040::setCS(pin_size_t pin) { bool SPIClassRP2040::setCS(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({1, 5, 17, 21, 33, 37}) /* SPI0 */, constexpr uint64_t valid[2] = { __bitset({1, 5, 17, 21, 33, 37}) /* SPI0 */,
__bitset({9, 13, 25, 29, 41, 45}) /* SPI1 */ __bitset({9, 13, 25, 29, 41, 45}) /* SPI1 */
}; };
@ -317,7 +317,7 @@ bool SPIClassRP2040::setCS(pin_size_t pin) {
} }
bool SPIClassRP2040::setSCK(pin_size_t pin) { bool SPIClassRP2040::setSCK(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({2, 6, 18, 22, 34, 38}) /* SPI0 */, constexpr uint64_t valid[2] = { __bitset({2, 6, 18, 22, 34, 38}) /* SPI0 */,
__bitset({10, 14, 26, 30, 42, 46}) /* SPI1 */ __bitset({10, 14, 26, 30, 42, 46}) /* SPI1 */
}; };
@ -344,7 +344,7 @@ bool SPIClassRP2040::setSCK(pin_size_t pin) {
} }
bool SPIClassRP2040::setTX(pin_size_t pin) { bool SPIClassRP2040::setTX(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({3, 7, 19, 23, 35, 39}) /* SPI0 */, constexpr uint64_t valid[2] = { __bitset({3, 7, 19, 23, 35, 39}) /* SPI0 */,
__bitset({11, 15, 27, 31, 43, 47}) /* SPI1 */ __bitset({11, 15, 27, 31, 43, 47}) /* SPI1 */
}; };

View file

@ -25,65 +25,219 @@
#include <hardware/spi.h> #include <hardware/spi.h>
#include "SPIHelper.h" #include "SPIHelper.h"
/**
@brief Implements a hardware-based SPI interface using the Pico's SPI blocks
*/
class SPIClassRP2040 : public arduino::HardwareSPI { class SPIClassRP2040 : public arduino::HardwareSPI {
public: public:
/**
@brief Create a PIO-based SPI instance, pins can be changed before begin() call
@param [in] spi SPI hardware instance (spi0/spi1)
@param [in] rx MISO GPIO
@param [in] cs CS GPIO
@param [in] sck SCK GPIO
@param [in] tx MOSI GPIO
*/
SPIClassRP2040(spi_inst_t *spi, pin_size_t rx, pin_size_t cs, pin_size_t sck, pin_size_t tx); SPIClassRP2040(spi_inst_t *spi, pin_size_t rx, pin_size_t cs, pin_size_t sck, pin_size_t tx);
// Send or receive 8- or 16-bit data. Returns read back value /**
@brief Send an 8-bit byte of data and return read-back 8-bit value
@param [in] data Data to send
@returns Read back byte from SPI interface
*/
byte transfer(uint8_t data) override; byte transfer(uint8_t data) override;
/**
@brief Send a 16-bit quantity over SPI and return read-back 16-bit value under a single CS assertion
@param [in] data Data to send
@returns Read back 16-bit quantity
*/
uint16_t transfer16(uint16_t data) override; uint16_t transfer16(uint16_t data) override;
// Sends buffer in 8 bit chunks. Overwrites buffer with read data
/**
@brief Sends buffer in 8 bit chunks under a single CS. Overwrites buffer with read data
@param [in, out] buf Buffer to read and write back into
@param [in] count Number of bytes to transmit/read
*/
void transfer(void *buf, size_t count) override; void transfer(void *buf, size_t count) override;
// Sends one buffer and receives into another, much faster! can set rx or txbuf to nullptr /**
@brief Sends one buffer and receives into another under a single CS. Can set rx or txbuf to nullptr
@param [in] txbuf Buffer to transmit or nullptr to send 0s
@param [out] rxbuf Buffer to read back into or nullptr to ignore returned data
@param [in] count Numbner of bytes to transmit/receive
*/
void transfer(const void *txbuf, void *rxbuf, size_t count) override; void transfer(const void *txbuf, void *rxbuf, size_t count) override;
// DMA/asynchronous transfers. Do not combime with synchronous runs or bad stuff will happen // DMA/asynchronous transfers. Do not combime with synchronous runs or bad stuff will happen
// All buffers must be valid for entire DMA and not touched until `finished()` returns true. // All buffers must be valid for entire DMA and not touched until `finished()` returns true.
/**
@brief Perform a transfer() using DMA in the background. Returns immediately, need to check for completion
@details
Do not combine asynchronous and synchronous transfers. All buffers must be valid until
the transfer reports that it is completed (``finished`` returns true).
@param [in] send Buffer to transmit, must remain valid through entire operation
@param [out] recv Buffer to receive, must remain valid through entire operation
@param [in] bytes Number of bytes to transfer under single CS
*/
bool transferAsync(const void *send, void *recv, size_t bytes); bool transferAsync(const void *send, void *recv, size_t bytes);
bool finishedAsync(); // Call to check if the async operations is completed and the buffer can be reused/read /**
void abortAsync(); // Cancel an outstanding async operation @brief Call to check if the async operations is completed and the buffer can be reused/read
@returns True if the asynchronous SPI operation has completed and ``recv`` buffer is valid
*/
bool finishedAsync();
/**
@brief Aborts an ongoing asynchronous SPI operation, if one is still operating
@details
Not normally needed, but in the case where a large, long SPI operation needs to be aborted
this call allows an application to safely stop the SPI and dispose of the ``recv`` and
``send`` buffers
*/
void abortAsync();
// Call before/after every complete transaction /**
@brief Begin an SPI transaction, sets SPI speed and masks necessary interrupts
@param [in] SPISettings SPI configuration parameters, including the clock speed
*/
void beginTransaction(SPISettings settings) override; void beginTransaction(SPISettings settings) override;
/**
@brief Ends an SPI transaction, unmasks and masked GPIO interrupts
*/
void endTransaction(void) override; void endTransaction(void) override;
// Assign pins, call before begin() /**
@brief Sets the MISO(RX) pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
bool setRX(pin_size_t pin); bool setRX(pin_size_t pin);
/**
@brief Sets the MISO(RX) pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
inline bool setMISO(pin_size_t pin) { inline bool setMISO(pin_size_t pin) {
return setRX(pin); return setRX(pin);
} }
/**
@brief Sets the CS pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
bool setCS(pin_size_t pin); bool setCS(pin_size_t pin);
/**
@brief Sets the SCK pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
bool setSCK(pin_size_t pin); bool setSCK(pin_size_t pin);
/**
@brief Sets the MOSI(TX) pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
bool setTX(pin_size_t pin); bool setTX(pin_size_t pin);
/**
@brief Sets the MOSI(TX) pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
inline bool setMOSI(pin_size_t pin) { inline bool setMOSI(pin_size_t pin) {
return setTX(pin); return setTX(pin);
} }
// Call once to init/deinit SPI class, select pins, etc. /**
@brief Call once to init/deinit SPI class, select pins, etc.
*/
virtual void begin() override { virtual void begin() override {
begin(false); begin(false);
} }
/**
@brief Call once to init/deinit SPI class, select pins, etc.
@param [in] hwCS Pass in true to enable HW-controlled CS. Otherwise application needs to assert/deassert CS.
*/
void begin(bool hwCS); void begin(bool hwCS);
/**
@brief Call to deinit and disable the SPI interface.
*/
void end() override; void end() override;
// Deprecated - do not use! /**
@brief Deprecated, do not use
@param [in] order Deprecated
*/
void setBitOrder(BitOrder order) __attribute__((deprecated)); void setBitOrder(BitOrder order) __attribute__((deprecated));
/**
@brief Deprecated, do not use
@param [in] order Deprecated
*/
void setDataMode(uint8_t uc_mode) __attribute__((deprecated)); void setDataMode(uint8_t uc_mode) __attribute__((deprecated));
/**
@brief Deprecated, do not use
@param [in] order Deprecated
*/
void setClockDivider(uint8_t uc_div) __attribute__((deprecated)); void setClockDivider(uint8_t uc_div) __attribute__((deprecated));
// List of GPIO IRQs to disable during a transaction /**
@brief Ensure specific GPIO interrupt is disabled during and SPI transaction to protect against re-entrancy. Multiple GPIOs supported by multiple calls.
@param [in] interruptNumber GPIO pin to mask
*/
virtual void usingInterrupt(int interruptNumber) override { virtual void usingInterrupt(int interruptNumber) override {
_helper.usingInterrupt(interruptNumber); _helper.usingInterrupt(interruptNumber);
} }
/**
@brief Remove a GPIO from the masked-during-transaction list.
@param [in] interruptNumber GPIO pin to unmask
*/
virtual void notUsingInterrupt(int interruptNumber) override { virtual void notUsingInterrupt(int interruptNumber) override {
_helper.notUsingInterrupt(interruptNumber); _helper.notUsingInterrupt(interruptNumber);
} }
virtual void attachInterrupt() override { /* noop */ }
virtual void detachInterrupt() override { /* noop */ } /**
@brief Deprecated, do not use
*/
virtual void attachInterrupt() override __attribute__((deprecated)) { /* noop */ }
/**
@brief Deprecated, do not use
*/
virtual void detachInterrupt() override __attribute__((deprecated)) { /* noop */ }
private: private:
void adjustBuffer(const void *s, void *d, size_t cnt, bool by16); void adjustBuffer(const void *s, void *d, size_t cnt, bool by16);

View file

@ -98,7 +98,7 @@ public:
return (reverseByte(w & 0xff) << 8) | (reverseByte(w >> 8)); return (reverseByte(w & 0xff) << 8) | (reverseByte(w >> 8));
} }
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
static constexpr int GPIOIRQREGS = 6; static constexpr int GPIOIRQREGS = 6;
#else #else
static constexpr int GPIOIRQREGS = 4; static constexpr int GPIOIRQREGS = 4;
@ -108,6 +108,9 @@ public:
@brief Disables any GPIO interrupts registered before an SPI transaction begins @brief Disables any GPIO interrupts registered before an SPI transaction begins
*/ */
void maskInterrupts() { void maskInterrupts() {
if (_usingIRQs.empty()) {
return;
}
noInterrupts(); // Avoid possible race conditions if IRQ comes in while main app is in middle of this noInterrupts(); // Avoid possible race conditions if IRQ comes in while main app is in middle of this
// Disable any IRQs that are being used for SPI // Disable any IRQs that are being used for SPI
io_bank0_irq_ctrl_hw_t *irq_ctrl_base = get_core_num() ? &iobank0_hw->proc1_irq_ctrl : &iobank0_hw->proc0_irq_ctrl; io_bank0_irq_ctrl_hw_t *irq_ctrl_base = get_core_num() ? &iobank0_hw->proc1_irq_ctrl : &iobank0_hw->proc0_irq_ctrl;
@ -134,6 +137,9 @@ public:
@brief Restores GPIO interrupts masks after an SPI transaction completes @brief Restores GPIO interrupts masks after an SPI transaction completes
*/ */
void unmaskInterrupts() { void unmaskInterrupts() {
if (_usingIRQs.empty()) {
return;
}
noInterrupts(); // Avoid race condition so the GPIO IRQs won't come back until all state is restored noInterrupts(); // Avoid race condition so the GPIO IRQs won't come back until all state is restored
DEBUGSPI("SPI::endTransaction()\n"); DEBUGSPI("SPI::endTransaction()\n");
// Re-enable IRQs // Re-enable IRQs

View file

@ -79,7 +79,7 @@ inline spi_cpha_t SPISlaveClass::cpha(SPISettings _spis) {
} }
bool SPISlaveClass::setRX(pin_size_t pin) { bool SPISlaveClass::setRX(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({0, 4, 16, 20, 32, 26}) /* SPI0 */, constexpr uint64_t valid[2] = { __bitset({0, 4, 16, 20, 32, 26}) /* SPI0 */,
__bitset({8, 12, 24, 28, 40, 44}) /* SPI1 */ __bitset({8, 12, 24, 28, 40, 44}) /* SPI1 */
}; };
@ -106,7 +106,7 @@ bool SPISlaveClass::setRX(pin_size_t pin) {
} }
bool SPISlaveClass::setCS(pin_size_t pin) { bool SPISlaveClass::setCS(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({1, 5, 17, 21, 33, 37}) /* SPI0 */, constexpr uint64_t valid[2] = { __bitset({1, 5, 17, 21, 33, 37}) /* SPI0 */,
__bitset({9, 13, 25, 29, 41, 45}) /* SPI1 */ __bitset({9, 13, 25, 29, 41, 45}) /* SPI1 */
}; };
@ -133,7 +133,7 @@ bool SPISlaveClass::setCS(pin_size_t pin) {
} }
bool SPISlaveClass::setSCK(pin_size_t pin) { bool SPISlaveClass::setSCK(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({2, 6, 18, 22, 34, 38}) /* SPI0 */, constexpr uint64_t valid[2] = { __bitset({2, 6, 18, 22, 34, 38}) /* SPI0 */,
__bitset({10, 14, 26, 30, 42, 46}) /* SPI1 */ __bitset({10, 14, 26, 30, 42, 46}) /* SPI1 */
}; };
@ -160,7 +160,7 @@ bool SPISlaveClass::setSCK(pin_size_t pin) {
} }
bool SPISlaveClass::setTX(pin_size_t pin) { bool SPISlaveClass::setTX(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({3, 7, 19, 23, 35, 39}) /* SPI0 */, constexpr uint64_t valid[2] = { __bitset({3, 7, 19, 23, 35, 39}) /* SPI0 */,
__bitset({11, 15, 27, 31, 43, 47}) /* SPI1 */ __bitset({11, 15, 27, 31, 43, 47}) /* SPI1 */
}; };

View file

@ -36,7 +36,7 @@ static const struct pio_program servo_program = {
.instructions = servo_program_instructions, .instructions = servo_program_instructions,
.length = 8, .length = 8,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = servo_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif

View file

@ -25,6 +25,9 @@
#include <api/HardwareSPI.h> #include <api/HardwareSPI.h>
#include <hardware/spi.h> #include <hardware/spi.h>
/**
@brief Implements a PIO-based SPI interface without pin restrictions
*/
class SoftwareSPI : public arduino::HardwareSPI { class SoftwareSPI : public arduino::HardwareSPI {
public: public:
/** /**
@ -37,53 +40,170 @@ public:
*/ */
SoftwareSPI(pin_size_t sck, pin_size_t miso, pin_size_t mosi, pin_size_t cs = -1); SoftwareSPI(pin_size_t sck, pin_size_t miso, pin_size_t mosi, pin_size_t cs = -1);
// Send or receive 8- or 16-bit data. Returns read back value /**
@brief Send an 8-bit byte of data and return read-back 8-bit value
@param [in] data Data to send
@returns Read back byte from SPI interface
*/
byte transfer(uint8_t data) override; byte transfer(uint8_t data) override;
/**
@brief Send a 16-bit quantity over SPI and return read-back 16-bit value under a single CS assertion
@param [in] data Data to send
@returns Read back 16-bit quantity
*/
uint16_t transfer16(uint16_t data) override; uint16_t transfer16(uint16_t data) override;
// Sends buffer in 8 bit chunks. Overwrites buffer with read data /**
@brief Sends buffer in 8 bit chunks under a single CS. Overwrites buffer with read data
@param [in, out] buf Buffer to read and write back into
@param [in] count Number of bytes to transmit/read
*/
void transfer(void *buf, size_t count) override; void transfer(void *buf, size_t count) override;
// Sends one buffer and receives into another, much faster! can set rx or txbuf to nullptr /**
@brief Sends one buffer and receives into another under a single CS. Can set rx or txbuf to nullptr
@param [in] txbuf Buffer to transmit or nullptr to send 0s
@param [out] rxbuf Buffer to read back into or nullptr to ignore returned data
@param [in] count Numbner of bytes to transmit/receive
*/
void transfer(const void *txbuf, void *rxbuf, size_t count) override; void transfer(const void *txbuf, void *rxbuf, size_t count) override;
// Call before/after every complete transaction /**
@brief Begin an SPI transaction, sets SPI speed and masks necessary interrupts
@param [in] SPISettings SPI configuration parameters, including the clock speed
*/
void beginTransaction(SPISettings settings) override; void beginTransaction(SPISettings settings) override;
/**
@brief Ends an SPI transaction, unmasks and masked GPIO interrupts
*/
void endTransaction(void) override; void endTransaction(void) override;
// Assign pins, call before begin() /**
@brief Sets the MISO(RX) pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
bool setMISO(pin_size_t pin); bool setMISO(pin_size_t pin);
/**
@brief Sets the MISO(RX) pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
inline bool setRX(pin_size_t pin) { inline bool setRX(pin_size_t pin) {
return setMISO(pin); return setMISO(pin);
} }
/**
@brief Sets the CS pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
bool setCS(pin_size_t pin); bool setCS(pin_size_t pin);
/**
@brief Sets the SCK pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
bool setSCK(pin_size_t pin); bool setSCK(pin_size_t pin);
/**
@brief Sets the MOSI(TX) pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
bool setMOSI(pin_size_t pin); bool setMOSI(pin_size_t pin);
/**
@brief Sets the MOSI(TX) pin. Call before begin()
@param [in] pin The GPIO number to assign to
@returns True on success
*/
inline bool setTX(pin_size_t pin) { inline bool setTX(pin_size_t pin) {
return setMOSI(pin); return setMOSI(pin);
} }
// Call once to init/deinit SPI class, select pins, etc. /**
@brief Call once to init/deinit SPI class, select pins, etc.
*/
virtual void begin() override { virtual void begin() override {
begin(false); begin(false);
} }
/**
@brief Call once to init/deinit SPI class, select pins, etc.
@param [in] hwCS Pass in true to enable HW-controlled CS. Otherwise application needs to assert/deassert CS.
*/
void begin(bool hwCS); void begin(bool hwCS);
/**
@brief Call to deinit and disable the SPI interface.
*/
void end() override; void end() override;
// Deprecated - do not use! /**
@brief Deprecated, do not use
@param [in] order Deprecated
*/
void setBitOrder(BitOrder order) __attribute__((deprecated)); void setBitOrder(BitOrder order) __attribute__((deprecated));
/**
@brief Deprecated, do not use
@param [in] uc_mode Deprecated
*/
void setDataMode(uint8_t uc_mode) __attribute__((deprecated)); void setDataMode(uint8_t uc_mode) __attribute__((deprecated));
/**
@brief Deprecated, do not use
@param [in] uc_div Deprecated
*/
void setClockDivider(uint8_t uc_div) __attribute__((deprecated)); void setClockDivider(uint8_t uc_div) __attribute__((deprecated));
// List of GPIO IRQs to disable during a transaction /**
@brief Ensure specific GPIO interrupt is disabled during and SPI transaction to protect against re-entrancy. Multiple GPIOs supported by multiple calls.
@param [in] interruptNumber GPIO pin to mask
*/
virtual void usingInterrupt(int interruptNumber) override { virtual void usingInterrupt(int interruptNumber) override {
_helper.usingInterrupt(interruptNumber); _helper.usingInterrupt(interruptNumber);
} }
/**
@brief Remove a GPIO from the masked-during-transaction list.
@param [in] interruptNumber GPIO pin to unmask
*/
virtual void notUsingInterrupt(int interruptNumber) override { virtual void notUsingInterrupt(int interruptNumber) override {
_helper.notUsingInterrupt(interruptNumber); _helper.notUsingInterrupt(interruptNumber);
} }
virtual void attachInterrupt() override { /* noop */ }
virtual void detachInterrupt() override { /* noop */ } /**
@brief Deprecated, do not use
*/
virtual void attachInterrupt() override __attribute__((deprecated)) { /* noop */ }
/**
@brief Deprecated, do not use
*/
virtual void detachInterrupt() override __attribute__((deprecated)) { /* noop */ }
private: private:
void _adjustPIO(int bits); void _adjustPIO(int bits);

View file

@ -28,7 +28,7 @@ static const struct pio_program spi_cpha0_program = {
.instructions = spi_cpha0_program_instructions, .instructions = spi_cpha0_program_instructions,
.length = 2, .length = 2,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = spi_cpha0_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -63,7 +63,7 @@ static const struct pio_program spi_cpha1_program = {
.instructions = spi_cpha1_program_instructions, .instructions = spi_cpha1_program_instructions,
.length = 3, .length = 3,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = spi_cpha1_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -133,7 +133,7 @@ static const struct pio_program spi_cpha0_cs_program = {
.instructions = spi_cpha0_cs_program_instructions, .instructions = spi_cpha0_cs_program_instructions,
.length = 9, .length = 9,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = spi_cpha0_cs_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif
@ -176,7 +176,7 @@ static const struct pio_program spi_cpha1_cs_program = {
.instructions = spi_cpha1_cs_program_instructions, .instructions = spi_cpha1_cs_program_instructions,
.length = 9, .length = 9,
.origin = -1, .origin = -1,
.pio_version = 0, .pio_version = spi_cpha1_cs_pio_version,
#if PICO_PIO_VERSION > 0 #if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0 .used_gpio_ranges = 0x0
#endif #endif

View file

@ -35,8 +35,8 @@
#if USE_WIFI #if USE_WIFI
#include <WiFi.h> #include <WiFi.h>
#elif USE_WIRED #elif USE_WIRED
#include <W5500lwIP.h> // Or W5100lwIP.h or ENC28J60lwIP.h #include <W5500lwIP.h> // or W6100lwIP.h or W5100lwIP.h or ENC28J60lwIP.h
Wiznet5500lwIP eth(1 /* chip select */); // or Wiznet5100lwIP or ENC28J60lwIP Wiznet5500lwIP eth(1 /* SPI chip select */); // or Wiznet6100lwIP or Wiznet5100lwIP or ENC28J60lwIP
#endif #endif
#include <WiFiClient.h> #include <WiFiClient.h>

View file

@ -6,42 +6,53 @@
const char* ssl_host = "www.akamai.com"; const char* ssl_host = "www.akamai.com";
const uint16_t ssl_port = 443; const uint16_t ssl_port = 443;
// openssl s_client -connect www.akamai.com:443 < /dev/null 2>/dev/null | openssl x509 -fingerprint -noout -in /dev/stdin | cut -f2 -d= | sed 's/^/const char fingerprint_ssl[] = "/' | sed 's/$/";/'
const char fingerprint_ssl[] = "D6:6C:EF:1A:8A:CE:27:18:D4:0C:83:2C:AE:4D:1B:B9:4C:B8:C9:83";
const char fingerprint_ssl [] PROGMEM = "48:EF:70:29:41:CE:64:C9:DF:57:A2:46:E8:34:E1:50:0B:70:AE:17"; // openssl s_client -connect www.akamai.com:443 < /dev/null 2>/dev/null | openssl x509 -pubkey -noout
const char pubkey_ssl [] PROGMEM = R"PUBKEY( const char pubkey_ssl[] = R"PUBKEY(
-----BEGIN PUBLIC KEY----- -----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEiuc+zlu43bv55+s0Fj6RiBW+olZm MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE2BD04+A9idhYCHJ4RBy2KHtvJAsz
c/AkoTP48CFCIGP1DET7Oufx6oe63GIuBzdVfR5D6R2z818b5gY1o2lBxg== KLkAzZOWDEqjNu4plNmiWMymBw0rJggZOU4/TE+a4KqzBgsus9QkFZh88w==
-----END PUBLIC KEY----- -----END PUBLIC KEY-----
)PUBKEY"; )PUBKEY";
const char cert_CA [] PROGMEM = R"CERT( // openssl s_client -connect www.akamai.com:443 < /dev/null 2> /dev/null | openssl x509
const char cert_CA[] = R"CERT(
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIEvjCCA6agAwIBAgIQBtjZBNVYQ0b2ii+nVCJ+xDANBgkqhkiG9w0BAQsFADBh MIIGAzCCBOugAwIBAgIQA0bb8BLx/7BiUlnlhKlA6TANBgkqhkiG9w0BAQsFADBP
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBE
d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD aWdpQ2VydCBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMTAeFw0yNDA5MDMwMDAwMDBa
QTAeFw0yMTA0MTQwMDAwMDBaFw0zMTA0MTMyMzU5NTlaME8xCzAJBgNVBAYTAlVT Fw0yNTA5MDMyMzU5NTlaMHYxCzAJBgNVBAYTAlVTMRYwFAYDVQQIEw1NYXNzYWNo
MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBS dXNldHRzMRIwEAYDVQQHEwlDYW1icmlkZ2UxIjAgBgNVBAoTGUFrYW1haSBUZWNo
U0EgU0hBMjU2IDIwMjAgQ0ExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC bm9sb2dpZXMsIEluYy4xFzAVBgNVBAMTDnd3dy5ha2FtYWkuY29tMFkwEwYHKoZI
AQEAwUuzZUdwvN1PWNvsnO3DZuUfMRNUrUpmRh8sCuxkB+Uu3Ny5CiDt3+PE0J6a zj0CAQYIKoZIzj0DAQcDQgAE2BD04+A9idhYCHJ4RBy2KHtvJAszKLkAzZOWDEqj
qXodgojlEVbbHp9YwlHnLDQNLtKS4VbL8Xlfs7uHyiUDe5pSQWYQYE9XE0nw6Ddn Nu4plNmiWMymBw0rJggZOU4/TE+a4KqzBgsus9QkFZh886OCA30wggN5MB8GA1Ud
g9/n00tnTCJRpt8OmRDtV1F0JuJ9x8piLhMbfyOIJVNvwTRYAIuE//i+p1hJInuW IwQYMBaAFLdrouqoqoSMeeq02g+YssWVdrn0MB0GA1UdDgQWBBR1CWtuGpgU+vEH
raKImxW8oHzf6VGo1bDtN+I2tIJLYrVJmuzHZ9bjPvXj1hJeRPG/cUJ9WIQDgLGB b6yp42l2leyozDAlBgNVHREEHjAcgg53d3cuYWthbWFpLmNvbYIKYWthbWFpLmNv
Afr5yjK7tI4nhyfFK3TUqNaX3sNk+crOU6JWvHgXjkkDKa77SU+kFbnO8lwZV21r bTA+BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3
eacroicgE7XQPUDTITAHk+qZ9QIDAQABo4IBgjCCAX4wEgYDVR0TAQH/BAgwBgEB LmRpZ2ljZXJ0LmNvbS9DUFMwDgYDVR0PAQH/BAQDAgOIMB0GA1UdJQQWMBQGCCsG
/wIBADAdBgNVHQ4EFgQUt2ui6qiqhIx56rTaD5iyxZV2ufQwHwYDVR0jBBgwFoAU AQUFBwMBBggrBgEFBQcDAjCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY3Js
A95QNVbRTLtm8KPiGxvDl7I90VUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQG My5kaWdpY2VydC5jb20vRGlnaUNlcnRUTFNSU0FTSEEyNTYyMDIwQ0ExLTQuY3Js
CCsGAQUFBwMBBggrBgEFBQcDAjB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGG MECgPqA8hjpodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRUTFNSU0FT
GGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL2Nh SEEyNTYyMDIwQ0ExLTQuY3JsMH8GCCsGAQUFBwEBBHMwcTAkBggrBgEFBQcwAYYY
Y2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNydDBCBgNV aHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEkGCCsGAQUFBzAChj1odHRwOi8vY2Fj
HR8EOzA5MDegNaAzhjFodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRH ZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUTFNSU0FTSEEyNTYyMDIwQ0ExLTEu
bG9iYWxSb290Q0EuY3JsMD0GA1UdIAQ2MDQwCwYJYIZIAYb9bAIBMAcGBWeBDAEB Y3J0MAwGA1UdEwEB/wQCMAAwggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB2ABLx
MAgGBmeBDAECATAIBgZngQwBAgIwCAYGZ4EMAQIDMA0GCSqGSIb3DQEBCwUAA4IB TjS9U3JMhAYZw48/ehP457Vih4icbTAFhOvlhiY6AAABkbhvAhwAAAQDAEcwRQIh
AQCAMs5eC91uWg0Kr+HWhMvAjvqFcO3aXbMM9yt1QP6FCvrzMXi3cEsaiVi6gL3z AKw2mqyB5bKpwGN5Dn4rLL5pjsNY03bEnNpVXltFpOtDAiBmwhRQg/V+whwdynkK
ax3pfs8LulicWdSQ0/1s/dCYbbdxglvPbQtaCdB73sRD2Cqk3p5BJl+7j5nL3a7h OOyuChdAd2JH76KE+XISMjPM3gB1AObSMWNAd4zBEEEG13G5zsHSQPaWhIb7uocy
qG+fh/50tx8bIKuxT8b1Z11dmzzp/2n3YWzW2fP9NsarA4h20ksudYbj/NhVfSbC Hf0eN45QAAABkbhvAm8AAAQDAEYwRAIgOw/ZyiiIsgDbM55pvJmV/CvwA5AGWbpC
EXffPgK2fPOre3qGNm+499iTcc+G33Mw+nur7SpZyEKEOxEXGlLzyQ4UfaJbcme6 lB9q78TiJj4CIC2d9w9Ntb3HTOrLQvwSiNOrpop+deZ3fa1LQ92miaclAHcAzPsP
ce1XR2bFuAJKZTRei9AqPCCcUZlM51Ke92sRKw2Sfh3oius2FkOH6ipjv3U/697E aoVxCWX+lZtTzumyfCLphVwNl422qX5UwP5MDbAAAAGRuG8CMAAABAMASDBGAiEA
A7sKPPcw7+uvTPyLNhBzPvOk oSSK9/26Uk3fqp7btK2SaEyWM/u++sOZXMeEOefnKwUCIQCqKysJztOF58PueXeE
pLliBWZUnjUrvPIbtxp31gQQITANBgkqhkiG9w0BAQsFAAOCAQEAAoJryZtJc8oc
+hf5vflkW2w0PdJ5NpbmjZOMTyutBRaJpxrDqKnjKBEOp6liZ2pDbUngGAwLEM30
KRBwJCc44u7w8Kj/KOoIZFoh9SiONAEn1qXWF0nFkYAD8J8yYwzkJy7fa3sdodaI
ex5NJosK/tyXjEBOcTrBsXkzs55pjSi+KJiiOHs/hDuBdyDtJs1ENAOswd8AWMSk
S9WycNxxEFH9VQgwgUhaI5Lc9J8rt3IJur1wp1JoDwdjIhs1M0rofgdW716UpmQ9
visdfGu8fCAlDSBPPC6gUPlFGFf4ujUmprJyBQ5xsYva0sVqhGbaoxtV7FdMDJkg
nDRma+9lPA==
-----END CERTIFICATE----- -----END CERTIFICATE-----
)CERT"; )CERT";

View file

@ -19,6 +19,8 @@
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Modified May 2025 by Sven Bruns (Lorandil on GitHub) to support user defined buffer size (inspired by ESP32 code)
*/ */
#include <Arduino.h> #include <Arduino.h>
@ -46,10 +48,14 @@ TwoWire::TwoWire(i2c_inst_t *i2c, pin_size_t sda, pin_size_t scl) {
_running = false; _running = false;
_txBegun = false; _txBegun = false;
_buffLen = 0; _buffLen = 0;
// allocate buffer memory early, so we don't fragment the heap later
_buffSize = WIRE_BUFFER_SIZE;
_buff = (uint8_t *)malloc(_buffSize);
} }
bool TwoWire::setSDA(pin_size_t pin) { bool TwoWire::setSDA(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44}) /* I2C0 */, constexpr uint64_t valid[2] = { __bitset({0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44}) /* I2C0 */,
__bitset({2, 6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46}) /* I2C1 */ __bitset({2, 6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46}) /* I2C1 */
}; };
@ -76,7 +82,7 @@ bool TwoWire::setSDA(pin_size_t pin) {
} }
bool TwoWire::setSCL(pin_size_t pin) { bool TwoWire::setSCL(pin_size_t pin) {
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
constexpr uint64_t valid[2] = { __bitset({1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45}) /* I2C0 */, constexpr uint64_t valid[2] = { __bitset({1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45}) /* I2C0 */,
__bitset({3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47}) /* I2C1 */ __bitset({3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47}) /* I2C1 */
}; };
@ -158,6 +164,16 @@ void TwoWire::begin(uint8_t addr) {
// ERROR // ERROR
return; return;
} }
// allocate buffer if necessary
if (!_buff) {
_buff = (uint8_t *)malloc(_buffSize);
if (!_buff) {
// ERROR
return;
}
}
_slave = true; _slave = true;
i2c_init(_i2c, _clkHz); i2c_init(_i2c, _clkHz);
i2c_set_slave_mode(_i2c, true, addr); i2c_set_slave_mode(_i2c, true, addr);
@ -192,7 +208,7 @@ void TwoWire::onIRQ() {
// First, pull off any data available // First, pull off any data available
if (irqstat & (1 << 2)) { if (irqstat & (1 << 2)) {
// RX_FULL // RX_FULL
if (_buffLen < (int)sizeof(_buff)) { if (_buffLen < int(_buffSize)) {
_buff[_buffLen++] = _i2c->hw->data_cmd & 0xff; _buff[_buffLen++] = _i2c->hw->data_cmd & 0xff;
} else { } else {
_i2c->hw->data_cmd; _i2c->hw->data_cmd;
@ -271,7 +287,7 @@ void TwoWire::beginTransmission(uint8_t addr) {
} }
size_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit) { size_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit) {
if (!_running || _txBegun || !quantity || (quantity > sizeof(_buff))) { if (!_running || _txBegun || !quantity || (quantity > _buffSize)) {
return 0; return 0;
} }
@ -448,7 +464,7 @@ size_t TwoWire::write(uint8_t ucData) {
return 0; return 0;
} }
} else { } else {
if (!_txBegun || (_buffLen == sizeof(_buff))) { if (!_txBegun || (_buffLen == int(_buffSize))) {
return 0; return 0;
} }
_buff[_buffLen++] = ucData; _buff[_buffLen++] = ucData;
@ -745,6 +761,20 @@ void TwoWire::clearTimeoutFlag() {
_timeoutFlag = false; _timeoutFlag = false;
} }
size_t TwoWire::setBufferSize(size_t bSize) {
if (_running) {
// ERROR - transmission already running. Report back current buffer size
return _buffSize;
}
// only free the buffer, if it already exists and the new size differs from the current one
if (_buff && (bSize != _buffSize)) {
free(_buff);
_buff = nullptr;
}
_buffSize = max(WIRE_BUFFER_SIZE_MIN, int(bSize)); // enforce minimum buffer size
return _buffSize;
}
#ifndef __WIRE0_DEVICE #ifndef __WIRE0_DEVICE
#define __WIRE0_DEVICE i2c0 #define __WIRE0_DEVICE i2c0
#endif #endif

View file

@ -19,6 +19,8 @@
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Modified May 2025 by Sven Bruns (Lorandil on GitHub) to support user defined buffer size (inspired by ESP32 code)
*/ */
#pragma once #pragma once
@ -30,8 +32,14 @@
// WIRE_HAS_END means Wire has end() // WIRE_HAS_END means Wire has end()
#define WIRE_HAS_END 1 #define WIRE_HAS_END 1
// WIRE_HAS_BUFFER_SIZE means Wire has setBufferSize()
#define WIRE_HAS_BUFFER_SIZE 1
#ifndef WIRE_BUFFER_SIZE #ifndef WIRE_BUFFER_SIZE
#define WIRE_BUFFER_SIZE 256 #define WIRE_BUFFER_SIZE 256 // default size, if none is set using Wire::setBuffersize(size_t)
#endif
#ifndef WIRE_BUFFER_SIZE_MIN
#define WIRE_BUFFER_SIZE_MIN 32 // minimum size for safe operation
#endif #endif
class TwoWire : public HardwareI2C { class TwoWire : public HardwareI2C {
@ -97,6 +105,8 @@ public:
bool getTimeoutFlag(void); bool getTimeoutFlag(void);
void clearTimeoutFlag(void); void clearTimeoutFlag(void);
size_t setBufferSize(size_t bSize); // set buffer size (call prior to 'begin()')
// IRQ callback // IRQ callback
void onIRQ(); void onIRQ();
@ -115,7 +125,9 @@ private:
bool _reset_with_timeout; bool _reset_with_timeout;
void _handleTimeout(bool reset); void _handleTimeout(bool reset);
uint8_t _buff[WIRE_BUFFER_SIZE]; uint8_t *_buff; // pointer to i2c buffer
size_t _buffSize; // current buffer size
int _buffLen; int _buffLen;
int _buffOff; int _buffOff;

View file

@ -75,7 +75,7 @@ void __removeEthernetPacketHandler(int id) {
} }
#define GPIOSTACKSIZE 8 #define GPIOSTACKSIZE 8
#ifdef PICO_RP2350B #if defined(PICO_RP2350) && !PICO_RP2350A // RP2350B
#define GPIOIRQREGS 6 #define GPIOIRQREGS 6
#define GPIOIRQREGSINIT 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff #define GPIOIRQREGSINIT 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
#else #else

View file

@ -186,6 +186,7 @@ protected:
SPIClass& _spiUnit; SPIClass& _spiUnit;
SPISettings _spiSettings = SPISettings(4000000, MSBFIRST, SPI_MODE0); SPISettings _spiSettings = SPISettings(4000000, MSBFIRST, SPI_MODE0);
netif _netif; netif _netif;
bool _isDHCP = true;
uint16_t _mtu; uint16_t _mtu;
int8_t _intrPin; int8_t _intrPin;
@ -282,6 +283,8 @@ bool LwipIntfDev<RawDev>::config(const IPAddress& localIP, const IPAddress& gate
return false; return false;
} }
_isDHCP = (localIP.v4() == 0);
IPAddress realGateway, realNetmask, realDns1; IPAddress realGateway, realNetmask, realDns1;
if (!ipAddressReorder(localIP, gateway, netmask, dns1, realGateway, realNetmask, realDns1)) { if (!ipAddressReorder(localIP, gateway, netmask, dns1, realGateway, realNetmask, realDns1)) {
return false; return false;
@ -389,8 +392,11 @@ bool LwipIntfDev<RawDev>::begin(const uint8_t* macAddress, const uint16_t mtu) {
_phID = __addEthernetPacketHandler([this] { this->handlePackets(); }); _phID = __addEthernetPacketHandler([this] { this->handlePackets(); });
} }
if (localIP().v4() == 0) { if (_isDHCP) {
// IP not set, starting DHCP // Destroy any existing address
ip4_addr_set_u32(ip_2_ip4(&_netif.ip_addr), 0);
// Start a new DHCP request
_netif.flags |= NETIF_FLAG_UP; _netif.flags |= NETIF_FLAG_UP;
switch (dhcp_start(&_netif)) { switch (dhcp_start(&_netif)) {
case ERR_OK: case ERR_OK:

View file

@ -8,7 +8,7 @@
const char* host = "djxmmx.net"; const char* host = "djxmmx.net";
const uint16_t port = 17; const uint16_t port = 17;
Wiznet55rp20lwIP eth(1 /* chip select */); Wiznet55rp20lwIP eth(20 /* chip select */);
void setup() { void setup() {
Serial.begin(115200); Serial.begin(115200);

View file

@ -51,7 +51,7 @@ public:
Constructor that uses the default hardware SPI pins Constructor that uses the default hardware SPI pins
@param cs the Arduino Chip Select / Slave Select pin (default 10) @param cs the Arduino Chip Select / Slave Select pin (default 10)
*/ */
Wiznet55rp20(int8_t cs = SS, SPIClass& spi = SPI, int8_t intr = -1); Wiznet55rp20(int8_t cs = WIZNET_PIO_SPI_CS_PIN, SPIClass& spi = SPI, int8_t intr = -1);
//Wiznet55rp20(); //Wiznet55rp20();
/** /**

View file

@ -14,6 +14,7 @@
#define wiznet_pio_spi_write_read_wrap_target 0 #define wiznet_pio_spi_write_read_wrap_target 0
#define wiznet_pio_spi_write_read_wrap 8 #define wiznet_pio_spi_write_read_wrap 8
#define wiznet_pio_spi_write_read_pio_version 0
#define wiznet_pio_spi_write_read_offset_write_bits 0u #define wiznet_pio_spi_write_read_offset_write_bits 0u
#define wiznet_pio_spi_write_read_offset_write_end 3u #define wiznet_pio_spi_write_read_offset_write_end 3u
@ -38,6 +39,10 @@ static const struct pio_program wiznet_pio_spi_write_read_program = {
.instructions = wiznet_pio_spi_write_read_program_instructions, .instructions = wiznet_pio_spi_write_read_program_instructions,
.length = 9, .length = 9,
.origin = -1, .origin = -1,
.pio_version = wiznet_pio_spi_write_read_pio_version,
#if PICO_PIO_VERSION > 0
.used_gpio_ranges = 0x0
#endif
}; };
static inline pio_sm_config wiznet_pio_spi_write_read_program_get_default_config(uint offset) { static inline pio_sm_config wiznet_pio_spi_write_read_program_get_default_config(uint offset) {

View file

@ -1,6 +1,6 @@
{ {
"name": "framework-arduinopico", "name": "framework-arduinopico",
"version": "1.40403.0", "version": "1.40504.0",
"description": "Arduino Wiring-based Framework (RPi Pico RP2040, RP2350)", "description": "Arduino Wiring-based Framework (RPi Pico RP2040, RP2350)",
"keywords": [ "keywords": [
"framework", "framework",

View file

@ -80,6 +80,9 @@
{ {
"name": "Adafruit KB2040" "name": "Adafruit KB2040"
}, },
{
"name": "Adafruit Feather RP2350 Adalogger"
},
{ {
"name": "Adafruit Feather RP2350 HSTX" "name": "Adafruit Feather RP2350 HSTX"
}, },
@ -90,7 +93,7 @@
"name": "Adafruit Metro RP2350" "name": "Adafruit Metro RP2350"
}, },
{ {
"name": "Adafruit FruitJam RP2350" "name": "Adafruit Fruit Jam RP2350"
}, },
{ {
"name": "Amken BunnyBoard" "name": "Amken BunnyBoard"
@ -212,6 +215,12 @@
{ {
"name": "iLabs Challenger 2350 BConnect" "name": "iLabs Challenger 2350 BConnect"
}, },
{
"name": "Makerbase MKS THR36"
},
{
"name": "Makerbase MKS THR42"
},
{ {
"name": "Melopero Cookie RP2040" "name": "Melopero Cookie RP2040"
}, },
@ -234,10 +243,13 @@
"name": "nullbits Bit-C PRO" "name": "nullbits Bit-C PRO"
}, },
{ {
"name": "Olimex RP2040-Pico30 2MB" "name": "Olimex Pico2XL"
}, },
{ {
"name": "Olimex RP2040-Pico30 16MB" "name": "Olimex Pico2XXL"
},
{
"name": "Olimex RP2040-Pico30"
}, },
{ {
"name": "Pimoroni PGA2040" "name": "Pimoroni PGA2040"
@ -257,6 +269,9 @@
{ {
"name": "Pimoroni Plasma2350" "name": "Pimoroni Plasma2350"
}, },
{
"name": "Pimoroni Servo2040"
},
{ {
"name": "Pimoroni Tiny2040" "name": "Pimoroni Tiny2040"
}, },
@ -290,6 +305,9 @@
{ {
"name": "Solder Party RP2350 Stamp XL" "name": "Solder Party RP2350 Stamp XL"
}, },
{
"name": "SparkFun IoT RedBoard RP2350"
},
{ {
"name": "SparkFun MicroMod RP2040" "name": "SparkFun MicroMod RP2040"
}, },
@ -308,6 +326,12 @@
{ {
"name": "SparkFun IoT Node LoRaWAN" "name": "SparkFun IoT Node LoRaWAN"
}, },
{
"name": "SparkFun XRP Controller (Beta)"
},
{
"name": "SparkFun XRP Controller"
},
{ {
"name": "Seeed INDICATOR RP2040" "name": "Seeed INDICATOR RP2040"
}, },
@ -378,22 +402,22 @@
"toolsDependencies": [ "toolsDependencies": [
{ {
"packager": "rp2040", "packager": "rp2040",
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-gcc" "name": "pqt-gcc"
}, },
{ {
"packager": "rp2040", "packager": "rp2040",
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-gcc-riscv" "name": "pqt-gcc-riscv"
}, },
{ {
"packager": "rp2040", "packager": "rp2040",
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-mklittlefs" "name": "pqt-mklittlefs"
}, },
{ {
"packager": "rp2040", "packager": "rp2040",
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-pioasm" "name": "pqt-pioasm"
}, },
{ {
@ -403,12 +427,12 @@
}, },
{ {
"packager": "rp2040", "packager": "rp2040",
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-openocd" "name": "pqt-openocd"
}, },
{ {
"packager": "rp2040", "packager": "rp2040",
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-picotool" "name": "pqt-picotool"
} }
], ],
@ -419,187 +443,187 @@
], ],
"tools": [ "tools": [
{ {
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-gcc", "name": "pqt-gcc",
"systems": [ "systems": [
{ {
"host": "arm64-apple-darwin", "host": "arm64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-apple-darwin20.4.arm-none-eabi-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-apple-darwin20.4.arm-none-eabi-1aec55e.250530.tar.gz",
"archiveFileName": "aarch64-apple-darwin20.4.arm-none-eabi-8ec9d6f.240929.tar.gz", "archiveFileName": "aarch64-apple-darwin20.4.arm-none-eabi-1aec55e.250530.tar.gz",
"checksum": "SHA-256:cb84f473efda1b8147d552b5e42a20017654fb13ffa8fa6fabdca6b517f0eaa9", "checksum": "SHA-256:d3fcb0976c8efd8a883e4ae82fbb863b14b372c2fff32846f340351d13dc1bda",
"size": "106002809" "size": "107229105"
}, },
{ {
"host": "aarch64-linux-gnu", "host": "aarch64-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-linux-gnu.arm-none-eabi-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-linux-gnu.arm-none-eabi-1aec55e.250530.tar.gz",
"archiveFileName": "aarch64-linux-gnu.arm-none-eabi-8ec9d6f.240929.tar.gz", "archiveFileName": "aarch64-linux-gnu.arm-none-eabi-1aec55e.250530.tar.gz",
"checksum": "SHA-256:f80c0bacbb9e522666e2f41a35a8536dfe1b959532062e63dd052a576ba7f418", "checksum": "SHA-256:4f2bb3039761292fcd2962cc90dbbf084f89238a986db69e1f9c272ff81fd7e9",
"size": "114435949" "size": "115660714"
}, },
{ {
"host": "arm-linux-gnueabihf", "host": "arm-linux-gnueabihf",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/arm-linux-gnueabihf.arm-none-eabi-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/arm-linux-gnueabihf.arm-none-eabi-1aec55e.250530.tar.gz",
"archiveFileName": "arm-linux-gnueabihf.arm-none-eabi-8ec9d6f.240929.tar.gz", "archiveFileName": "arm-linux-gnueabihf.arm-none-eabi-1aec55e.250530.tar.gz",
"checksum": "SHA-256:736679d3aa55ba08ca2cfc4e88e1a71eff2bcba7c4d1aed2f9d3e325bf7f362d", "checksum": "SHA-256:08c644058405393bf98154acb0a8758aa6673cf19731e2a315d4623c285672d5",
"size": "107960125" "size": "109176264"
}, },
{ {
"host": "i686-pc-linux-gnu", "host": "i686-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-linux-gnu.arm-none-eabi-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-linux-gnu.arm-none-eabi-1aec55e.250530.tar.gz",
"archiveFileName": "i686-linux-gnu.arm-none-eabi-8ec9d6f.240929.tar.gz", "archiveFileName": "i686-linux-gnu.arm-none-eabi-1aec55e.250530.tar.gz",
"checksum": "SHA-256:ba8bfadaa28da88777f95de0f28720d4bc6d24367bacc0751fe7f91fabec543d", "checksum": "SHA-256:4f78f591b20f85587c016f453c254c75fd5ed8438ce218a1286cf630c5813dbb",
"size": "117654636" "size": "118889455"
}, },
{ {
"host": "i686-mingw32", "host": "i686-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-w64-mingw32.arm-none-eabi-8ec9d6f.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-w64-mingw32.arm-none-eabi-1aec55e.250530.zip",
"archiveFileName": "i686-w64-mingw32.arm-none-eabi-8ec9d6f.240929.zip", "archiveFileName": "i686-w64-mingw32.arm-none-eabi-1aec55e.250530.zip",
"checksum": "SHA-256:3b9672cbd4ebb32cd1510bfd7839ab0b59f6fac3ecd6151aa0d10047a1c2230a", "checksum": "SHA-256:a338b24c481d2df86c403f7caf0aaf97ae4e6d79e4b08cb8355b03faa11e283a",
"size": "124363537" "size": "126641402"
}, },
{ {
"host": "x86_64-apple-darwin", "host": "x86_64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-apple-darwin20.4.arm-none-eabi-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-apple-darwin20.4.arm-none-eabi-1aec55e.250530.tar.gz",
"archiveFileName": "x86_64-apple-darwin20.4.arm-none-eabi-8ec9d6f.240929.tar.gz", "archiveFileName": "x86_64-apple-darwin20.4.arm-none-eabi-1aec55e.250530.tar.gz",
"checksum": "SHA-256:509820140252eed71cc4148f89c00318febddea08e500ffaa642cb7b7831ba59", "checksum": "SHA-256:c8555d7d580f7e6157cfc60b205b5a785006f4a3138ffab136a015e19af3104c",
"size": "118604056" "size": "119805934"
}, },
{ {
"host": "x86_64-pc-linux-gnu", "host": "x86_64-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-linux-gnu.arm-none-eabi-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-linux-gnu.arm-none-eabi-1aec55e.250530.tar.gz",
"archiveFileName": "x86_64-linux-gnu.arm-none-eabi-8ec9d6f.240929.tar.gz", "archiveFileName": "x86_64-linux-gnu.arm-none-eabi-1aec55e.250530.tar.gz",
"checksum": "SHA-256:ae082491cc07d60c014ca928c406aed72c4b1ead4c33076216c77fd2d242f74d", "checksum": "SHA-256:8607c781b7b01032c264b3357889e958998fe2e557342ad0f8153233fa5f7f37",
"size": "115607420" "size": "116824397"
}, },
{ {
"host": "x86_64-mingw32", "host": "x86_64-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-w64-mingw32.arm-none-eabi-8ec9d6f.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-w64-mingw32.arm-none-eabi-1aec55e.250530.zip",
"archiveFileName": "x86_64-w64-mingw32.arm-none-eabi-8ec9d6f.240929.zip", "archiveFileName": "x86_64-w64-mingw32.arm-none-eabi-1aec55e.250530.zip",
"checksum": "SHA-256:a1ac18cde856fa01aafc9985a719f3749abd3588ac6725d1781f02da94b84d54", "checksum": "SHA-256:f07ec7ac929f56ecadaeabeca67a406133b66ed0b0f5cc3d5ac0e6ffae8f92cf",
"size": "128268207" "size": "130565828"
} }
] ]
}, },
{ {
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-picotool", "name": "pqt-picotool",
"systems": [ "systems": [
{ {
"host": "arm64-apple-darwin", "host": "arm64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-apple-darwin20.4.picotool-8a9af99.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-apple-darwin20.4.picotool-c56c005.250530.tar.gz",
"archiveFileName": "aarch64-apple-darwin20.4.picotool-8a9af99.240929.tar.gz", "archiveFileName": "aarch64-apple-darwin20.4.picotool-c56c005.250530.tar.gz",
"checksum": "SHA-256:71eb93270747c5910893f36f5552affd4c254f085b4a7850765b29eec28040ec", "checksum": "SHA-256:53c94035ac6f19c1d9377e31249f3f3adb82ac87ac1f3f7a06e31ca78d4ea5fe",
"size": "856205" "size": "856207"
}, },
{ {
"host": "aarch64-linux-gnu", "host": "aarch64-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-linux-gnu.picotool-8a9af99.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-linux-gnu.picotool-c56c005.250530.tar.gz",
"archiveFileName": "aarch64-linux-gnu.picotool-8a9af99.240929.tar.gz", "archiveFileName": "aarch64-linux-gnu.picotool-c56c005.250530.tar.gz",
"checksum": "SHA-256:1f73e2c6ce8c7503678dfacec3d2ea889e0f5a161912eff68b290cf405206094", "checksum": "SHA-256:606e2215adc16b57ada4c8873ae58194c721deca489ba18ada9318460b48e662",
"size": "896502" "size": "733779"
}, },
{ {
"host": "arm-linux-gnueabihf", "host": "arm-linux-gnueabihf",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/arm-linux-gnueabihf.picotool-8a9af99.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/arm-linux-gnueabihf.picotool-c56c005.250530.tar.gz",
"archiveFileName": "arm-linux-gnueabihf.picotool-8a9af99.240929.tar.gz", "archiveFileName": "arm-linux-gnueabihf.picotool-c56c005.250530.tar.gz",
"checksum": "SHA-256:6cd60632141f68e1bde7afef93dc5521e78dfff2be421ffddd2da76af5bb3eb1", "checksum": "SHA-256:948410645d2deea77117ab5d80719b89c2d0cf8a61158319a3deee9dff74a526",
"size": "840254" "size": "683701"
}, },
{ {
"host": "i686-pc-linux-gnu", "host": "i686-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-linux-gnu.picotool-8a9af99.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-linux-gnu.picotool-c56c005.250530.tar.gz",
"archiveFileName": "i686-linux-gnu.picotool-8a9af99.240929.tar.gz", "archiveFileName": "i686-linux-gnu.picotool-c56c005.250530.tar.gz",
"checksum": "SHA-256:bd5acd7d7085ba01bff07fef6ce4a5ba067abd0b8914c33fae371ec87c846d83", "checksum": "SHA-256:0acd8d2af8b3486f5caeb39dfaaca83d41dd5e5e5b61125f1d6b1afd6061c806",
"size": "984652" "size": "816954"
}, },
{ {
"host": "i686-mingw32", "host": "i686-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-w64-mingw32.picotool-8a9af99.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-w64-mingw32.picotool-c56c005.250530.zip",
"archiveFileName": "i686-w64-mingw32.picotool-8a9af99.240929.zip", "archiveFileName": "i686-w64-mingw32.picotool-c56c005.250530.zip",
"checksum": "SHA-256:9f7c90c4f05996f5156beb4dc06edfc7e0b36006edd6ad273daca0085ea19ac6", "checksum": "SHA-256:336cfe24722096887deaa13575639f80cc4a65f61c9d8208b0a1d23fdc376939",
"size": "1335369" "size": "1335370"
}, },
{ {
"host": "x86_64-apple-darwin", "host": "x86_64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-apple-darwin20.4.picotool-8a9af99.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-apple-darwin20.4.picotool-c56c005.250530.tar.gz",
"archiveFileName": "x86_64-apple-darwin20.4.picotool-8a9af99.240929.tar.gz", "archiveFileName": "x86_64-apple-darwin20.4.picotool-c56c005.250530.tar.gz",
"checksum": "SHA-256:a8d30f63e421901000d2b2520f047d1dc586f827f41a3ef52056fd92272ff051", "checksum": "SHA-256:f82b426d2c47edb4f7b02f0de999bac936c4c139203bbb5b2440c0c12091a553",
"size": "829477" "size": "829479"
}, },
{ {
"host": "x86_64-pc-linux-gnu", "host": "x86_64-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-linux-gnu.picotool-8a9af99.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-linux-gnu.picotool-c56c005.250530.tar.gz",
"archiveFileName": "x86_64-linux-gnu.picotool-8a9af99.240929.tar.gz", "archiveFileName": "x86_64-linux-gnu.picotool-c56c005.250530.tar.gz",
"checksum": "SHA-256:4c5b43afd1e9dba149753089c9715e110f2612cbd47fa005fb033adbe5237ad8", "checksum": "SHA-256:354e408e6cbe03d162623f3ce89ee4f82827374cdcc3cb036c95fc39e8efce80",
"size": "926046" "size": "770012"
}, },
{ {
"host": "x86_64-mingw32", "host": "x86_64-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-w64-mingw32.picotool-8a9af99.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-w64-mingw32.picotool-c56c005.250530.zip",
"archiveFileName": "x86_64-w64-mingw32.picotool-8a9af99.240929.zip", "archiveFileName": "x86_64-w64-mingw32.picotool-c56c005.250530.zip",
"checksum": "SHA-256:d4a43c8172f6b32de412a08e4deac4ef50218f5955c9cda85411b252fcecaea3", "checksum": "SHA-256:457509c762a0e9ffccd1363bc7d304e8d3632aa70f772602f3627baacd2a4177",
"size": "1270392" "size": "1270392"
} }
] ]
}, },
{ {
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-openocd", "name": "pqt-openocd",
"systems": [ "systems": [
{ {
"host": "arm64-apple-darwin", "host": "arm64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-apple-darwin20.4.openocd-ebec9504d.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-apple-darwin20.4.openocd-ebec9504d.250530.tar.gz",
"archiveFileName": "aarch64-apple-darwin20.4.openocd-ebec9504d.240929.tar.gz", "archiveFileName": "aarch64-apple-darwin20.4.openocd-ebec9504d.250530.tar.gz",
"checksum": "SHA-256:d2f2e615b45cb57dad5bf8cc8637dc047f0e2a2d6d07907b961f82fdc9d9dff1", "checksum": "SHA-256:6d460848bc2eeaabda53cc622f8e576429256a26ebaad80dbae474ff1b3be440",
"size": "1981025" "size": "1981026"
}, },
{ {
"host": "aarch64-linux-gnu", "host": "aarch64-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-linux-gnu.openocd-ebec9504d.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-linux-gnu.openocd-ebec9504d.250530.tar.gz",
"archiveFileName": "aarch64-linux-gnu.openocd-ebec9504d.240929.tar.gz", "archiveFileName": "aarch64-linux-gnu.openocd-ebec9504d.250530.tar.gz",
"checksum": "SHA-256:b9f98837bce6da1e7d2229d8e2a9a2736a433356b82cea678b8fc4e95c3cd30f", "checksum": "SHA-256:233445bef68e48f4bdbd30a8b322baaf1c6bcac379c680b2d135ac02002ccdb8",
"size": "7354446" "size": "7355050"
}, },
{ {
"host": "arm-linux-gnueabihf", "host": "arm-linux-gnueabihf",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/arm-linux-gnueabihf.openocd-ebec9504d.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/arm-linux-gnueabihf.openocd-ebec9504d.250530.tar.gz",
"archiveFileName": "arm-linux-gnueabihf.openocd-ebec9504d.240929.tar.gz", "archiveFileName": "arm-linux-gnueabihf.openocd-ebec9504d.250530.tar.gz",
"checksum": "SHA-256:5a13e718029d5b86fef880f78e60e7521fcf1952911cd65b4cbfc8ef09a5d37c", "checksum": "SHA-256:b527247039041f947af7f7f462eab2abab6986c6f6a60381490f4e933757ebcf",
"size": "7209884" "size": "7210349"
}, },
{ {
"host": "i686-pc-linux-gnu", "host": "i686-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-linux-gnu.openocd-ebec9504d.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-linux-gnu.openocd-ebec9504d.250530.tar.gz",
"archiveFileName": "i686-linux-gnu.openocd-ebec9504d.240929.tar.gz", "archiveFileName": "i686-linux-gnu.openocd-ebec9504d.250530.tar.gz",
"checksum": "SHA-256:fa324ab0a8a20dab6335196e6b8ebb5fb0c083dc4d8017140287068bf85b3b5f", "checksum": "SHA-256:38cdff7120e3fa370b7a550412c66c168fac9971c52c7938a0e6db57e6fbb0a1",
"size": "6944581" "size": "6945216"
}, },
{ {
"host": "i686-mingw32", "host": "i686-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-w64-mingw32.openocd-ebec9504d.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-w64-mingw32.openocd-ebec9504d.250530.zip",
"archiveFileName": "i686-w64-mingw32.openocd-ebec9504d.240929.zip", "archiveFileName": "i686-w64-mingw32.openocd-ebec9504d.250530.zip",
"checksum": "SHA-256:f0d9cd099bb80d9f68b3554ef9233b2576c4959b4d2ce7444a9a5358d3bd40e0", "checksum": "SHA-256:ba78df9fff54be509348f46af2a7a187553593c889fd70293bcd673cdaa6337a",
"size": "2597199" "size": "2597199"
}, },
{ {
"host": "x86_64-apple-darwin", "host": "x86_64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-apple-darwin20.4.openocd-ebec9504d.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-apple-darwin20.4.openocd-ebec9504d.250530.tar.gz",
"archiveFileName": "x86_64-apple-darwin20.4.openocd-ebec9504d.240929.tar.gz", "archiveFileName": "x86_64-apple-darwin20.4.openocd-ebec9504d.250530.tar.gz",
"checksum": "SHA-256:e06283df22585bf6a83742d364d3594f7bcd724aa8be83de0446c3d1eaca7a58", "checksum": "SHA-256:06489aac36a97be87dff144df57ef7ae6dd525cfc5583c55c2426cb1bdc54d90",
"size": "3193818" "size": "3193821"
}, },
{ {
"host": "x86_64-pc-linux-gnu", "host": "x86_64-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-linux-gnu.openocd-ebec9504d.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-linux-gnu.openocd-ebec9504d.250530.tar.gz",
"archiveFileName": "x86_64-linux-gnu.openocd-ebec9504d.240929.tar.gz", "archiveFileName": "x86_64-linux-gnu.openocd-ebec9504d.250530.tar.gz",
"checksum": "SHA-256:d8dd0740e16414488de35f5ca1ddfcfe85763fe25d55a46cb9df8698ea83836d", "checksum": "SHA-256:56a4b435e1e3f0b5803946ab48262b97289e2ced1b753806bca1c353e36778e1",
"size": "7375538" "size": "7376227"
}, },
{ {
"host": "x86_64-mingw32", "host": "x86_64-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-w64-mingw32.openocd-ebec9504d.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-w64-mingw32.openocd-ebec9504d.250530.zip",
"archiveFileName": "x86_64-w64-mingw32.openocd-ebec9504d.240929.zip", "archiveFileName": "x86_64-w64-mingw32.openocd-ebec9504d.250530.zip",
"checksum": "SHA-256:4c6463c2818f7b9623d1c08c17c6e6036bd8d522631098d8befde5b66ab312f9", "checksum": "SHA-256:9998c1559a9e9c5bb792405b94690c53eca392cd5e329096efe393ba0b6af246",
"size": "2541780" "size": "2541780"
} }
] ]
@ -674,188 +698,188 @@
] ]
}, },
{ {
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-gcc-riscv", "name": "pqt-gcc-riscv",
"systems": [ "systems": [
{ {
"host": "arm64-apple-darwin", "host": "arm64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-apple-darwin20.4.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-apple-darwin20.4.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"archiveFileName": "aarch64-apple-darwin20.4.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "archiveFileName": "aarch64-apple-darwin20.4.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"checksum": "SHA-256:2dc5495acf7de48ce8e1c3f723e78102ad06add8e8e5dee86bf1dc05b25147ad", "checksum": "SHA-256:18de7da67984c5675a1591b53605ab118366924b98b9dc11b553530697ddc631",
"size": "139017383" "size": "141916362"
}, },
{ {
"host": "aarch64-linux-gnu", "host": "aarch64-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-linux-gnu.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-linux-gnu.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"archiveFileName": "aarch64-linux-gnu.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "archiveFileName": "aarch64-linux-gnu.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"checksum": "SHA-256:5d70f84ee56d68583ff61eff6461a4f3e2ecfcd445ffecdbb53e944dd229de5e", "checksum": "SHA-256:df668033e4225950bf6fe6895f94acfd6ceaab8647b12fe6f3277a98d44a3129",
"size": "148943445" "size": "151826001"
}, },
{ {
"host": "arm-linux-gnueabihf", "host": "arm-linux-gnueabihf",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/arm-linux-gnueabihf.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/arm-linux-gnueabihf.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"archiveFileName": "arm-linux-gnueabihf.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "archiveFileName": "arm-linux-gnueabihf.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"checksum": "SHA-256:65a3cd450d1b2a18e4bb6192f375e98e82a9808545d517a21357900a931f83f2", "checksum": "SHA-256:7e585192865a4bc4c4cd5366c3ed6400b31afc0b802c573c292ee92ce272739d",
"size": "142237277" "size": "145079225"
}, },
{ {
"host": "i686-pc-linux-gnu", "host": "i686-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-linux-gnu.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-linux-gnu.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"archiveFileName": "i686-linux-gnu.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "archiveFileName": "i686-linux-gnu.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"checksum": "SHA-256:130a9d0e970609dd27f70a27d5d34ed927b6a270f956f52aec3b636a206d86f6", "checksum": "SHA-256:a0ff84ae6c6a0c96b5bb4ff99b3c20d0228e436051e9aa960bf8168355f3cf6c",
"size": "153960388" "size": "156843280"
}, },
{ {
"host": "i686-mingw32", "host": "i686-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-w64-mingw32.riscv32-unknown-elf-8ec9d6f.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-w64-mingw32.riscv32-unknown-elf-1aec55e.250530.zip",
"archiveFileName": "i686-w64-mingw32.riscv32-unknown-elf-8ec9d6f.240929.zip", "archiveFileName": "i686-w64-mingw32.riscv32-unknown-elf-1aec55e.250530.zip",
"checksum": "SHA-256:25f985cd7ff242fa93a808582911545529eeab2d84b16ac96509425c11249c36", "checksum": "SHA-256:083832808526d5736108f58927c9279719a3a923e8f9027cabd889a48c5f28af",
"size": "159523471" "size": "163747749"
}, },
{ {
"host": "x86_64-apple-darwin", "host": "x86_64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-apple-darwin20.4.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-apple-darwin20.4.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"archiveFileName": "x86_64-apple-darwin20.4.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "archiveFileName": "x86_64-apple-darwin20.4.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"checksum": "SHA-256:4144abfef1c69cee272b6621dd995a5e88ff1e3cf646c8da30d64d9b1cd44b47", "checksum": "SHA-256:cf49bf9bada0b90cd2db0d3028bcd88a9b9485a2944c219c352e03c6ab2ba389",
"size": "153526986" "size": "156380254"
}, },
{ {
"host": "x86_64-pc-linux-gnu", "host": "x86_64-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-linux-gnu.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-linux-gnu.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"archiveFileName": "x86_64-linux-gnu.riscv32-unknown-elf-8ec9d6f.240929.tar.gz", "archiveFileName": "x86_64-linux-gnu.riscv32-unknown-elf-1aec55e.250530.tar.gz",
"checksum": "SHA-256:63ed149ba20ddc215479eaae5f1709a6bd882f4cd583a52ac2171f9096fda3a5", "checksum": "SHA-256:0f7cfbf97e06bdaaef9fd68f364f11cea9ee9f04a72486547a4c6ae66491d0e0",
"size": "151383989" "size": "154290544"
}, },
{ {
"host": "x86_64-mingw32", "host": "x86_64-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-w64-mingw32.riscv32-unknown-elf-8ec9d6f.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-w64-mingw32.riscv32-unknown-elf-1aec55e.250530.zip",
"archiveFileName": "x86_64-w64-mingw32.riscv32-unknown-elf-8ec9d6f.240929.zip", "archiveFileName": "x86_64-w64-mingw32.riscv32-unknown-elf-1aec55e.250530.zip",
"checksum": "SHA-256:182b38d22b8a4447b8b335c1ce482d16bfb0720be51d6368b404c8628a372dd8", "checksum": "SHA-256:ac6be8c69ee4b2c2153a865fa593f77b6c9c078d43612486cc33ff23cd8d15ab",
"size": "163390255" "size": "167659589"
} }
] ]
}, },
{ {
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-pioasm", "name": "pqt-pioasm",
"systems": [ "systems": [
{ {
"host": "arm64-apple-darwin", "host": "arm64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-apple-darwin20.4.pioasm-efe2103.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-apple-darwin20.4.pioasm-9fdfe11.250530.tar.gz",
"archiveFileName": "aarch64-apple-darwin20.4.pioasm-efe2103.240929.tar.gz", "archiveFileName": "aarch64-apple-darwin20.4.pioasm-9fdfe11.250530.tar.gz",
"checksum": "SHA-256:6afebe366be3aefd1caa268ec309bd486d7f1f98eedba033ba3b83a0653f1184", "checksum": "SHA-256:23aa8d9afacb556aaf97819c953a3a5d75aeee8fd8cfcaa43c36b39b08a5a594",
"size": "267869" "size": "268119"
}, },
{ {
"host": "aarch64-linux-gnu", "host": "aarch64-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-linux-gnu.pioasm-efe2103.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-linux-gnu.pioasm-9fdfe11.250530.tar.gz",
"archiveFileName": "aarch64-linux-gnu.pioasm-efe2103.240929.tar.gz", "archiveFileName": "aarch64-linux-gnu.pioasm-9fdfe11.250530.tar.gz",
"checksum": "SHA-256:48ca0fe638bf8ccca654c0588678178c3d9c2f933892dbd67244fe5f5637eacb", "checksum": "SHA-256:fb6df3d97b5e03859617565317dd88092f57e158878b436ae0c54c8113276609",
"size": "644212" "size": "644159"
}, },
{ {
"host": "arm-linux-gnueabihf", "host": "arm-linux-gnueabihf",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/arm-linux-gnueabihf.pioasm-efe2103.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/arm-linux-gnueabihf.pioasm-9fdfe11.250530.tar.gz",
"archiveFileName": "arm-linux-gnueabihf.pioasm-efe2103.240929.tar.gz", "archiveFileName": "arm-linux-gnueabihf.pioasm-9fdfe11.250530.tar.gz",
"checksum": "SHA-256:06001c3eaf5fbe29e94634218569d13c8d61d6007f7b8da0cca1e7f1fd9414cc", "checksum": "SHA-256:0dd9c0942ddc56044fb684eaf44f8444313b2d3a476c4545863d8e632dc1afc9",
"size": "576904" "size": "577126"
}, },
{ {
"host": "i686-pc-linux-gnu", "host": "i686-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-linux-gnu.pioasm-efe2103.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-linux-gnu.pioasm-9fdfe11.250530.tar.gz",
"archiveFileName": "i686-linux-gnu.pioasm-efe2103.240929.tar.gz", "archiveFileName": "i686-linux-gnu.pioasm-9fdfe11.250530.tar.gz",
"checksum": "SHA-256:09c4db3bf797b2a9f5edc3db05717c32c2fdd045ebca12ffba1c3ba037759470", "checksum": "SHA-256:2f54fd0355964c4069e9f105ecade3183764ba1e2d57dfd1546d8c065132b619",
"size": "703370" "size": "703647"
}, },
{ {
"host": "i686-mingw32", "host": "i686-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-w64-mingw32.pioasm-efe2103.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-w64-mingw32.pioasm-9fdfe11.250530.zip",
"archiveFileName": "i686-w64-mingw32.pioasm-efe2103.240929.zip", "archiveFileName": "i686-w64-mingw32.pioasm-9fdfe11.250530.zip",
"checksum": "SHA-256:50ec452554c000c692e1f8ee6657a5bb47d99aae62ac10cbf2da3e97cdc45db1", "checksum": "SHA-256:ea59960c2a4516b5a4d770613548300d0ae8aab1ec9aa4990cec0251a1a2b0d7",
"size": "797527" "size": "797374"
}, },
{ {
"host": "x86_64-apple-darwin", "host": "x86_64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-apple-darwin20.4.pioasm-efe2103.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-apple-darwin20.4.pioasm-9fdfe11.250530.tar.gz",
"archiveFileName": "x86_64-apple-darwin20.4.pioasm-efe2103.240929.tar.gz", "archiveFileName": "x86_64-apple-darwin20.4.pioasm-9fdfe11.250530.tar.gz",
"checksum": "SHA-256:9161b685fe394a6bbc19e3f14082d018d230a33941edd523d163d158f0480422", "checksum": "SHA-256:a69f28aa203a515ea2270a7b274c155c60e1de48a8d5ed1341de50c8d62f238e",
"size": "780453" "size": "780687"
}, },
{ {
"host": "x86_64-pc-linux-gnu", "host": "x86_64-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-linux-gnu.pioasm-efe2103.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-linux-gnu.pioasm-9fdfe11.250530.tar.gz",
"archiveFileName": "x86_64-linux-gnu.pioasm-efe2103.240929.tar.gz", "archiveFileName": "x86_64-linux-gnu.pioasm-9fdfe11.250530.tar.gz",
"checksum": "SHA-256:974481d6b9678c73cefc3c7df657647bc216f2d6c2bdef12236aa06542246973", "checksum": "SHA-256:ec079c8964f79bc56fe62eb6bc7d711315ec4e939f853956bf36bffd13555470",
"size": "649767" "size": "649984"
}, },
{ {
"host": "x86_64-mingw32", "host": "x86_64-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-w64-mingw32.pioasm-efe2103.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-w64-mingw32.pioasm-9fdfe11.250530.zip",
"archiveFileName": "x86_64-w64-mingw32.pioasm-efe2103.240929.zip", "archiveFileName": "x86_64-w64-mingw32.pioasm-9fdfe11.250530.zip",
"checksum": "SHA-256:73cc318e0b1df84fcb661ae9322e22a52f49678f44d3766b4baa82b328b19822", "checksum": "SHA-256:8ec38271642b1b3ae650316b7355d9195812fe805c6c7b6f22b706a56d6c275f",
"size": "929510" "size": "929788"
} }
] ]
}, },
{ {
"version": "4.0.1-8ec9d6f", "version": "4.1.0-1aec55e",
"name": "pqt-mklittlefs", "name": "pqt-mklittlefs",
"systems": [ "systems": [
{ {
"host": "arm64-apple-darwin", "host": "arm64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-apple-darwin20.4.mklittlefs-2f7654f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-apple-darwin20.4.mklittlefs-db0513a.250530.tar.gz",
"archiveFileName": "aarch64-apple-darwin20.4.mklittlefs-2f7654f.240929.tar.gz", "archiveFileName": "aarch64-apple-darwin20.4.mklittlefs-db0513a.250530.tar.gz",
"checksum": "SHA-256:09ddf3f856f2828e94c1e3599021265eb1e69ed84d659604a638af4a010f4f3d", "checksum": "SHA-256:eb33a68039c3fee582db90efeda9332edb96746b4173d9ac83bb35fed4f0fafd",
"size": "72517" "size": "72455"
}, },
{ {
"host": "aarch64-linux-gnu", "host": "aarch64-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/aarch64-linux-gnu.mklittlefs-2f7654f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/aarch64-linux-gnu.mklittlefs-db0513a.250530.tar.gz",
"archiveFileName": "aarch64-linux-gnu.mklittlefs-2f7654f.240929.tar.gz", "archiveFileName": "aarch64-linux-gnu.mklittlefs-db0513a.250530.tar.gz",
"checksum": "SHA-256:47e276ee0707e78fa4b588ef4346187071ea4be194519d405b8a1da91d34e682", "checksum": "SHA-256:e724923d634ce117836b5fd71cc6821282d84d9f4624701bd468b8bfc87b47a1",
"size": "684064" "size": "683775"
}, },
{ {
"host": "arm-linux-gnueabihf", "host": "arm-linux-gnueabihf",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/arm-linux-gnueabihf.mklittlefs-2f7654f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/arm-linux-gnueabihf.mklittlefs-db0513a.250530.tar.gz",
"archiveFileName": "arm-linux-gnueabihf.mklittlefs-2f7654f.240929.tar.gz", "archiveFileName": "arm-linux-gnueabihf.mklittlefs-db0513a.250530.tar.gz",
"checksum": "SHA-256:f4fb24a675de0bf3575ed6320ae1053d67355bbd3af116933bb1a90c1989bf57", "checksum": "SHA-256:0d6fdc45d341e88a43186e666d3f968be0919f3934b29eca6e6d7ca09c36c112",
"size": "632936" "size": "632909"
}, },
{ {
"host": "i686-pc-linux-gnu", "host": "i686-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-linux-gnu.mklittlefs-2f7654f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-linux-gnu.mklittlefs-db0513a.250530.tar.gz",
"archiveFileName": "i686-linux-gnu.mklittlefs-2f7654f.240929.tar.gz", "archiveFileName": "i686-linux-gnu.mklittlefs-db0513a.250530.tar.gz",
"checksum": "SHA-256:29df0ca122767357a7f14a2b5fb6e6d1f912789086dcb5e3c39b9df8d85f908a", "checksum": "SHA-256:853d9e041468aaff05c130f9ebd56a0ed977b750e79d29409f2f5c24b3eb33f7",
"size": "665594" "size": "665575"
}, },
{ {
"host": "i686-mingw32", "host": "i686-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/i686-w64-mingw32.mklittlefs-2f7654f.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/i686-w64-mingw32.mklittlefs-db0513a.250530.zip",
"archiveFileName": "i686-w64-mingw32.mklittlefs-2f7654f.240929.zip", "archiveFileName": "i686-w64-mingw32.mklittlefs-db0513a.250530.zip",
"checksum": "SHA-256:fa9071ee8f806ca7bf1cc16e1cb2be5588908cff929ec91e007dafa33eb4be1c", "checksum": "SHA-256:8471d2315ba92137e0b88aea8e71fee4e0834e4b75867c79ffdaa5657ab7c940",
"size": "1232212" "size": "1232388"
}, },
{ {
"host": "x86_64-apple-darwin", "host": "x86_64-apple-darwin",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-apple-darwin20.4.mklittlefs-2f7654f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-apple-darwin20.4.mklittlefs-db0513a.250530.tar.gz",
"archiveFileName": "x86_64-apple-darwin20.4.mklittlefs-2f7654f.240929.tar.gz", "archiveFileName": "x86_64-apple-darwin20.4.mklittlefs-db0513a.250530.tar.gz",
"checksum": "SHA-256:50a932d7c0351a70c3ecfce725b2c7bd926ddfb086145c225bb1134ad1b1a5ff", "checksum": "SHA-256:f37c1946df5d2f4047d7703b07b953bb04efd8cf56baa3992c0a6fe625a11158",
"size": "621594" "size": "621818"
}, },
{ {
"host": "x86_64-pc-linux-gnu", "host": "x86_64-pc-linux-gnu",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-linux-gnu.mklittlefs-2f7654f.240929.tar.gz", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-linux-gnu.mklittlefs-db0513a.250530.tar.gz",
"archiveFileName": "x86_64-linux-gnu.mklittlefs-2f7654f.240929.tar.gz", "archiveFileName": "x86_64-linux-gnu.mklittlefs-db0513a.250530.tar.gz",
"checksum": "SHA-256:aec72ad65cec9a96afda0507605661dfd552d5e304dd654c1b1ebb2bcc9f2d76", "checksum": "SHA-256:a135f6d4a51137c420e92da24469c84d4502f762dd8dc8d6f40bc794508f61ed",
"size": "690461" "size": "690394"
}, },
{ {
"host": "x86_64-mingw32", "host": "x86_64-mingw32",
"url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.0.1/x86_64-w64-mingw32.mklittlefs-2f7654f.240929.zip", "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/4.1.0/x86_64-w64-mingw32.mklittlefs-db0513a.250530.zip",
"archiveFileName": "x86_64-w64-mingw32.mklittlefs-2f7654f.240929.zip", "archiveFileName": "x86_64-w64-mingw32.mklittlefs-db0513a.250530.zip",
"checksum": "SHA-256:83f75c88e8e44fa1a38346ccff2e89756ffcfcda96b5d849f9e6563d996081eb", "checksum": "SHA-256:7db0ecc013cec3dad4e18987508f8e86c0aecd8453978559220742562aeb05b9",
"size": "1328984" "size": "1328438"
} }
] ]
} }

@ -1 +1 @@
Subproject commit 95ea6acad131124694cda1c162c52cd30e0aece0 Subproject commit 9fdfe110dc2f44cb4c23f49370db45a6689a5a08

View file

@ -20,7 +20,7 @@
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
name=Raspberry Pi RP2040/RP2350 Boards name=Raspberry Pi RP2040/RP2350 Boards
version=4.4.3 version=4.5.4
# Required discoveries and monitors # Required discoveries and monitors
# --------------------------------- # ---------------------------------
@ -60,7 +60,7 @@ compiler.libbearssl="{runtime.platform.path}/lib/{build.chip}/libbearssl.a"
compiler.c.cmd={build.toolchain}-gcc compiler.c.cmd={build.toolchain}-gcc
compiler.c.flags=-c {compiler.warning_flags} {compiler.defines} {compiler.flags} -MMD {compiler.includes} -std=gnu17 -g -pipe compiler.c.flags=-c {compiler.warning_flags} {compiler.defines} {compiler.flags} -MMD {compiler.includes} -std=gnu17 -g -pipe
compiler.c.elf.cmd={build.toolchain}-g++ compiler.c.elf.cmd={build.toolchain}-g++
compiler.c.elf.flags={compiler.warning_flags} {compiler.defines} {compiler.flags} {build.flags.optimize} -u _printf_float -u _scanf_float compiler.c.elf.flags={compiler.warning_flags} {compiler.defines} {compiler.flags} {build.flags.optimize}
compiler.S.cmd={build.toolchain}-gcc compiler.S.cmd={build.toolchain}-gcc
compiler.S.flags=-c {compiler.warning_flags} {compiler.defines} -g -x assembler-with-cpp -MMD {compiler.includes} {build.toolchainopts} -g compiler.S.flags=-c {compiler.warning_flags} {compiler.defines} -g -x assembler-with-cpp -MMD {compiler.includes} {build.toolchainopts} -g
compiler.cpp.cmd={build.toolchain}-g++ compiler.cpp.cmd={build.toolchain}-g++
@ -203,6 +203,7 @@ tools.uf2conv-network.cmd={runtime.platform.path}/system/python3/python3
tools.uf2conv-network.upload.protocol=uf2 tools.uf2conv-network.upload.protocol=uf2
tools.uf2conv-network.upload.params.verbose= tools.uf2conv-network.upload.params.verbose=
tools.uf2conv-network.upload.params.quiet= tools.uf2conv-network.upload.params.quiet=
tools.uf2conv-network.upload.field.password=Password
tools.uf2conv-network.upload.pattern="{cmd}" -I "{runtime.platform.path}/tools/espota.py" -i "{upload.port.address}" -p "{upload.port.properties.port}" "--auth={upload.field.password}" -f "{build.path}/{build.project_name}.bin" tools.uf2conv-network.upload.pattern="{cmd}" -I "{runtime.platform.path}/tools/espota.py" -i "{upload.port.address}" -p "{upload.port.properties.port}" "--auth={upload.field.password}" -f "{build.path}/{build.project_name}.bin"
#tools.picotool.cmd={runtime.tools.pqt-picotool.path} #tools.picotool.cmd={runtime.tools.pqt-picotool.path}

View file

@ -30,6 +30,15 @@ as necessary to add any add'l fields or menus required. Used because the
`boards.txt` file is very repetitive and it's safer to generate with code `boards.txt` file is very repetitive and it's safer to generate with code
than by hand. than by hand.
## makepacer.cpp
Generates ``libraries/PWMAudio/src/PWMAudioPrecalc.h` which contains the
precalculated DMA pacer settings for common audio sample rates and CPU
frequencies. Makes setting the frequency for PWMAudio instantaneous.
## makepio.py
Rebuilds all the ``*.pio`` files in the core and libraries using the
currently installed pioasm. Use when a new PIOASM is available.
## makever.py ## makever.py
Updates the version info prior to a release in platform.txt, package.json, Updates the version info prior to a release in platform.txt, package.json,
and the version header. Run from root of the repo. and the version header. Run from root of the repo.

View file

@ -30,7 +30,8 @@
"svd_path": "rp2040.svd" "svd_path": "rp2040.svd"
}, },
"frameworks": [ "frameworks": [
"arduino" "arduino",
"picosdk"
], ],
"name": "Helios", "name": "Helios",
"upload": { "upload": {

View file

@ -30,7 +30,8 @@
"svd_path": "rp2040.svd" "svd_path": "rp2040.svd"
}, },
"frameworks": [ "frameworks": [
"arduino" "arduino",
"picosdk"
], ],
"name": "DudesCab", "name": "DudesCab",
"upload": { "upload": {

Some files were not shown because too many files have changed in this diff Show more