Skip to content

Commit 7197516

Browse files
committed
support pico-sdk 2.3.0
1 parent 85f6b54 commit 7197516

5 files changed

Lines changed: 14 additions & 11 deletions

File tree

.github/actions/build-and-rename/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ runs:
2828
using: 'composite'
2929
steps:
3030
- name: Build
31-
uses: elehobica/build-pico@2.2.0
31+
uses: elehobica/build-pico@2.3.0
3232
with:
3333
path: ${{ inputs.path }}
3434
build: ${{ inputs.build }}

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
88
### Added
99
* Add build_docker.sh
1010
### Changed
11-
* Support pico-sdk 2.2.0
11+
* Support pico-sdk 2.3.0
1212

1313
## [v0.9.7] - 2025-04-15
1414
### Added

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ For complete portable player with Li-Po battery operation, refer to the followin
115115
* See ["Getting started with Raspberry Pi Pico"](https://datasheets.raspberrypi.org/pico/getting-started-with-pico.pdf)
116116
* Put "pico-sdk", "pico-examples" and "pico-extras" on the same level with this project folder.
117117
* Set environmental variables for PICO_SDK_PATH, PICO_EXTRAS_PATH and PICO_EXAMPLES_PATH
118-
* Confirmed with Pico SDK 2.1.1
118+
* Confirmed with Pico SDK 2.3.0
119119
```
120-
> git clone -b 2.1.1 https://github.com/raspberrypi/pico-sdk.git
120+
> git clone -b 2.3.0 https://github.com/raspberrypi/pico-sdk.git
121121
> cd pico-sdk
122122
> git submodule update -i
123123
> cd ..
124-
> git clone -b sdk-2.1.1 https://github.com/raspberrypi/pico-examples.git
124+
> git clone -b sdk-2.3.0 https://github.com/raspberrypi/pico-examples.git
125125
>
126-
> git clone -b sdk-2.1.1 https://github.com/raspberrypi/pico-extras.git
126+
> git clone -b sdk-2.3.0 https://github.com/raspberrypi/pico-extras.git
127127
>
128128
> git clone -b main https://github.com/elehobica/RPi_Pico_WAV_Player.git
129129
> cd RPi_Pico_WAV_Player
@@ -143,7 +143,7 @@ For complete portable player with Li-Po battery operation, refer to the followin
143143
```
144144
* Put "*.uf2" on RPI-RP2 or RP2350 drive
145145
### Linux
146-
* Build is confirmed with [pico-sdk-dev-docker:sdk-2.2.0](https://hub.docker.com/r/elehobica/pico-sdk-dev-docker)
146+
* Build is confirmed with [pico-sdk-dev-docker:sdk-2.3.0](https://hub.docker.com/r/elehobica/pico-sdk-dev-docker)
147147
* Confirmed with cmake-3.22.1 and arm-none-eabi-gcc (15:10.3-2021.07-4) 10.3.1
148148
```
149149
$ cd RPi_Pico_WAV_Player
@@ -154,7 +154,7 @@ $ make -j4
154154
```
155155
* Download "*.uf2" on RPI-RP2 or RP2350 drive
156156
### Local build with Docker (build_docker.sh)
157-
* `build_docker.sh` builds this project inside the same SDK image as CI ([pico-sdk-dev-docker:sdk-2.2.0](https://hub.docker.com/r/elehobica/pico-sdk-dev-docker)), so no local Pico SDK installation is required
157+
* `build_docker.sh` builds this project inside the same SDK image as CI ([pico-sdk-dev-docker:sdk-2.3.0](https://hub.docker.com/r/elehobica/pico-sdk-dev-docker)), so no local Pico SDK installation is required
158158
* Requirements: Docker, and submodules initialized (`git submodule update -i`)
159159
* No need to set PICO_SDK_PATH / PICO_EXTRAS_PATH / PICO_EXAMPLES_PATH (provided by the image)
160160
```

build_docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#------------------------------------------------------
77
#
88
# Local Docker build script that mirrors .github/workflows/build-binaries.yml.
9-
# Uses the same SDK image as CI (elehobica/pico-sdk-dev-docker:sdk-2.2.0)
9+
# Uses the same SDK image as CI (elehobica/pico-sdk-dev-docker:sdk-2.3.0)
1010
# and runs cmake/make inside the container.
1111
#
1212
# Run it from anywhere; it builds this repository (the folder containing this
@@ -16,7 +16,7 @@
1616

1717
set -e
1818

19-
IMAGE="elehobica/pico-sdk-dev-docker:sdk-2.2.0"
19+
IMAGE="elehobica/pico-sdk-dev-docker:sdk-2.3.0"
2020
SDK_PATH_IN_IMAGE="/home/rp2dev/pico/pico-sdk" # PICO_SDK_PATH inside the container
2121
PROJECT_ROOT="$(cd "$(dirname "$0")" && pwd)" # repository root (has CMakeLists.txt)
2222
PROJECT_NAME="$(basename "$PROJECT_ROOT")"

src/power_manage.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,10 @@ void pw_set_pll_usb_96MHz()
355355

356356
void pm_reboot()
357357
{
358-
watchdog_reboot(0, 0, PICO_STDIO_USB_RESET_RESET_TO_FLASH_DELAY_MS);
358+
// PICO_STDIO_USB_RESET_RESET_TO_FLASH_DELAY_MS is no longer exposed since Pico SDK 2.3.0,
359+
// so use a local constant with the same 100ms delay value.
360+
static const uint32_t REBOOT_DELAY_MS = 100;
361+
watchdog_reboot(0, 0, REBOOT_DELAY_MS);
359362
}
360363

361364
bool pm_is_caused_reboot()

0 commit comments

Comments
 (0)