Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for SDK 2.1.0 #35

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
pico_w httpd example builds again
ndabas committed Aug 19, 2024

Verified

This commit was signed with the committer’s verified signature.
cjdenio Caleb Denio
commit 152169e91d7b7c03f94ad433183ae289790b7c05
8 changes: 4 additions & 4 deletions config/repositories.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"repositories": [
{
"href": "https://github.com/raspberrypi/pico-sdk.git",
"tree": "2.0.0",
"href": "https://github.com/ndabas/pico-sdk.git",
"tree": "2.0.0-0",
"submodules": true
},
{
"href": "https://github.com/raspberrypi/pico-examples.git",
"tree": "sdk-2.0.0"
"href": "https://github.com/ndabas/pico-examples.git",
"tree": "sdk-2.0.0-0"
},
{
"href": "https://github.com/raspberrypi/pico-extras.git",
18 changes: 10 additions & 8 deletions packages/pico-setup-windows/pico-setup.cmd
Original file line number Diff line number Diff line change
@@ -38,17 +38,19 @@ for %%i in (examples extras playground) do (
)

rem Build a couple of examples
mkdir "%PICO_REPOS_PATH%\pico-examples\build"
pushd "%PICO_REPOS_PATH%\pico-examples\build"
cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Debug --fresh || exit /b 1
for %%j in (pico pico2) do (
mkdir "%PICO_REPOS_PATH%\pico-examples\build-%%j"
pushd "%PICO_REPOS_PATH%\pico-examples\build-%%j"
cmake -G Ninja .. -DPICO_BOARD=%%j -DCMAKE_BUILD_TYPE=Debug --fresh || exit /b 1

for %%i in (blink "hello_world/all") do (
echo Building %%i for %%j
ninja "%%i" || exit /b 1
)

for %%i in (blink "hello_world/all") do (
echo Building %%i
ninja "%%i" || exit /b 1
popd
)

popd

if "%interactive%" equ "1" (
rem Open repo folder in Explorer
start .
38 changes: 29 additions & 9 deletions tests/pico-build.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
@if not defined _echo echo off

goto main

:test-build

mkdir "%BUILD_DIR%"
pushd "%BUILD_DIR%"
cmake "%SRC_DIR%" -G Ninja -DCMAKE_BUILD_TYPE=Debug --fresh %* || exit /b 1
cmake --build . || exit /b 1
popd

goto :EOF

:main

call "%PICO_INSTALL_PATH%\pico-env.cmd" || exit /b 1

pushd "%PICO_REPOS_PATH%"
@@ -10,15 +24,21 @@ popd

subst P: "%PICO_REPOS_PATH%" || exit /b 1

pushd "P:\pico-examples\build"
cmake -G Ninja .. -DPICO_BOARD=pico_w -DWIFI_SSID=ssid -DWIFI_PASSWORD=pass "-DFREERTOS_KERNEL_PATH=P:\FreeRTOS-Kernel" -DTEST_TCP_SERVER_IP=10.10.10.10 -DCMAKE_BUILD_TYPE=Debug --fresh || exit /b 1
ninja --quiet || exit /b 1
popd
set "SRC_DIR=P:\pico-examples"

mkdir "P:\pico-sdk-build"
pushd "P:\pico-sdk-build"
cmake "%PICO_SDK_PATH%" -G Ninja -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE=Debug -DPICO_BOARD=pico_w --fresh || exit /b 1
ninja --quiet || exit /b 1
popd
set "BUILD_DIR=P:\pico-examples\build-pico"
call :test-build -DPICO_BOARD=pico || exit /b 1

set "BUILD_DIR=P:\pico-examples\build-pico2"
call :test-build -DPICO_BOARD=pico2 || exit /b 1

rem call :test-build build-pico2-riscv -DPICO_BOARD=pico2 -DPICO_PLATFORM=rp2350-riscv || exit /b 1

set "BUILD_DIR=P:\pico-examples\build-pico_w"
call :test-build -DPICO_BOARD=pico_w -DWIFI_SSID=ssid -DWIFI_PASSWORD=pass "-DFREERTOS_KERNEL_PATH=P:\FreeRTOS-Kernel" -DTEST_TCP_SERVER_IP=10.10.10.10 || exit /b 1

set "SRC_DIR=%PICO_SDK_PATH%"
set "BUILD_DIR=P:\pico-sdk-build"
call :test-build -DPICO_SDK_TESTS_ENABLED=1 -DPICO_BOARD=pico_w || exit /b 1

subst P: /d