Skip to content

Commit 075f546

Browse files
visrealmvisrealm
committed
Updated SD card library to latest
1 parent 1d2bfdf commit 075f546

File tree

7 files changed

+35
-35
lines changed

7 files changed

+35
-35
lines changed

‎.vscode/c_cpp_properties.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
"name": "Pico",
55
"includePath": [
66
"${workspaceFolder}/**",
7-
"${userHome}/.pico-sdk/sdk/2.0.0/**"
7+
"${userHome}/.pico-sdk/sdk/2.2.0/**"
88
],
99
"forcedInclude": [
1010
"${workspaceFolder}/build/generated/pico_base/pico/config_autogen.h",
11-
"${userHome}/.pico-sdk/sdk/2.0.0/src/common/pico_base_headers/include/pico.h"
11+
"${userHome}/.pico-sdk/sdk/2.2.0/src/common/pico_base_headers/include/pico.h"
1212
],
1313
"defines": [],
14-
"compilerPath": "${userHome}/.pico-sdk/toolchain/13_2_Rel1/bin/arm-none-eabi-gcc",
14+
"compilerPath": "${userHome}/.pico-sdk/toolchain/14_2_Rel1/bin/arm-none-eabi-gcc",
1515
"compileCommands": "${workspaceFolder}/build/compile_commands.json",
1616
"cStandard": "c17",
1717
"cppStandard": "c++14",
1818
"intelliSenseMode": "linux-gcc-arm"
1919
}
2020
],
2121
"version": 4
22-
}
22+
}

‎.vscode/launch.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"interface/cmsis-dap.cfg",
1616
"target/${command:raspberry-pi-pico.getTarget}.cfg"
1717
],
18-
"svdFile": "${userHome}/.pico-sdk/sdk/2.0.0/src/${command:raspberry-pi-pico.getChip}/hardware_regs/${command:raspberry-pi-pico.getChipUppercase}.svd",
18+
"svdFile": "${userHome}/.pico-sdk/sdk/2.2.0/src/${command:raspberry-pi-pico.getChip}/hardware_regs/${command:raspberry-pi-pico.getChipUppercase}.svd",
1919
"runToEntryPoint": "main",
2020
// Fix for no_flash binaries, where monitor reset halt doesn't do what is expected
2121
// Also works fine for flash binaries
@@ -37,7 +37,7 @@
3737
"gdbTarget": "localhost:3333",
3838
"gdbPath": "${command:raspberry-pi-pico.getGDBPath}",
3939
"device": "${command:raspberry-pi-pico.getChipUppercase}",
40-
"svdFile": "${userHome}/.pico-sdk/sdk/2.0.0/src/${command:raspberry-pi-pico.getChip}/hardware_regs/${command:raspberry-pi-pico.getChipUppercase}.svd",
40+
"svdFile": "${userHome}/.pico-sdk/sdk/2.2.0/src/${command:raspberry-pi-pico.getChip}/hardware_regs/${command:raspberry-pi-pico.getChipUppercase}.svd",
4141
"runToEntryPoint": "main",
4242
// Give restart the same functionality as runToEntryPoint - main
4343
"postRestartCommands": [
@@ -63,7 +63,7 @@
6363
"limit": 4
6464
},
6565
"preLaunchTask": "Flash",
66-
"svdPath": "${userHome}/.pico-sdk/sdk/2.0.0/src/${command:raspberry-pi-pico.getChip}/hardware_regs/${command:raspberry-pi-pico.getChipUppercase}.svd"
66+
"svdPath": "${userHome}/.pico-sdk/sdk/2.2.0/src/${command:raspberry-pi-pico.getChip}/hardware_regs/${command:raspberry-pi-pico.getChipUppercase}.svd"
6767
},
6868
]
6969
}

‎.vscode/settings.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@
1515
"cmake.automaticReconfigure": false,
1616
"cmake.configureOnOpen": false,
1717
"cmake.generator": "Ninja",
18-
"cmake.cmakePath": "${userHome}/.pico-sdk/cmake/v3.28.6/bin/cmake",
18+
"cmake.cmakePath": "${userHome}/.pico-sdk/cmake/v3.31.5/bin/cmake",
1919
"C_Cpp.debugShortcut": false,
2020
"terminal.integrated.env.windows": {
21-
"PICO_SDK_PATH": "${env:USERPROFILE}/.pico-sdk/sdk/2.0.0",
22-
"PICO_TOOLCHAIN_PATH": "${env:USERPROFILE}/.pico-sdk/toolchain/13_2_Rel1",
23-
"Path": "${env:USERPROFILE}/.pico-sdk/toolchain/13_2_Rel1/bin;${env:USERPROFILE}/.pico-sdk/picotool/2.0.0/picotool;${env:USERPROFILE}/.pico-sdk/cmake/v3.28.6/bin;${env:USERPROFILE}/.pico-sdk/ninja/v1.12.1;${env:PATH}"
21+
"PICO_SDK_PATH": "${env:USERPROFILE}/.pico-sdk/sdk/2.2.0",
22+
"PICO_TOOLCHAIN_PATH": "${env:USERPROFILE}/.pico-sdk/toolchain/14_2_Rel1",
23+
"Path": "${env:USERPROFILE}/.pico-sdk/toolchain/14_2_Rel1/bin;${env:USERPROFILE}/.pico-sdk/picotool/2.2.0-a4/picotool;${env:USERPROFILE}/.pico-sdk/cmake/v3.31.5/bin;${env:USERPROFILE}/.pico-sdk/ninja/v1.12.1;${env:PATH}"
2424
},
2525
"terminal.integrated.env.osx": {
26-
"PICO_SDK_PATH": "${env:HOME}/.pico-sdk/sdk/2.0.0",
27-
"PICO_TOOLCHAIN_PATH": "${env:HOME}/.pico-sdk/toolchain/13_2_Rel1",
28-
"PATH": "${env:HOME}/.pico-sdk/toolchain/13_2_Rel1/bin:${env:HOME}/.pico-sdk/picotool/2.0.0/picotool:${env:HOME}/.pico-sdk/cmake/v3.28.6/bin:${env:HOME}/.pico-sdk/ninja/v1.12.1:${env:PATH}"
26+
"PICO_SDK_PATH": "${env:HOME}/.pico-sdk/sdk/2.2.0",
27+
"PICO_TOOLCHAIN_PATH": "${env:HOME}/.pico-sdk/toolchain/14_2_Rel1",
28+
"PATH": "${env:HOME}/.pico-sdk/toolchain/14_2_Rel1/bin:${env:HOME}/.pico-sdk/picotool/2.2.0-a4/picotool:${env:HOME}/.pico-sdk/cmake/v3.31.5/bin:${env:HOME}/.pico-sdk/ninja/v1.12.1:${env:PATH}"
2929
},
3030
"terminal.integrated.env.linux": {
31-
"PICO_SDK_PATH": "${env:HOME}/.pico-sdk/sdk/2.0.0",
32-
"PICO_TOOLCHAIN_PATH": "${env:HOME}/.pico-sdk/toolchain/13_2_Rel1",
33-
"PATH": "${env:HOME}/.pico-sdk/toolchain/13_2_Rel1/bin:${env:HOME}/.pico-sdk/picotool/2.0.0/picotool:${env:HOME}/.pico-sdk/cmake/v3.28.6/bin:${env:HOME}/.pico-sdk/ninja/v1.12.1:${env:PATH}"
31+
"PICO_SDK_PATH": "${env:HOME}/.pico-sdk/sdk/2.2.0",
32+
"PICO_TOOLCHAIN_PATH": "${env:HOME}/.pico-sdk/toolchain/14_2_Rel1",
33+
"PATH": "${env:HOME}/.pico-sdk/toolchain/14_2_Rel1/bin:${env:HOME}/.pico-sdk/picotool/2.2.0-a4/picotool:${env:HOME}/.pico-sdk/cmake/v3.31.5/bin:${env:HOME}/.pico-sdk/ninja/v1.12.1:${env:PATH}"
3434
},
3535
"raspberry-pi-pico.cmakeAutoConfigure": true,
3636
"raspberry-pi-pico.useCmakeTools": false,
37-
"raspberry-pi-pico.cmakePath": "${HOME}/.pico-sdk/cmake/v3.28.6/bin/cmake",
37+
"raspberry-pi-pico.cmakePath": "${HOME}/.pico-sdk/cmake/v3.31.5/bin/cmake",
3838
"raspberry-pi-pico.ninjaPath": "${HOME}/.pico-sdk/ninja/v1.12.1/ninja",
3939
"raspberry-pi-pico.python3Path": "${HOME}/.pico-sdk/python/3.12.1/python.exe",
4040
"files.associations": {

‎.vscode/tasks.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{
2121
"label": "Run Project",
2222
"type": "process",
23-
"command": "${env:HOME}/.pico-sdk/picotool/2.0.0/picotool/picotool",
23+
"command": "${env:HOME}/.pico-sdk/picotool/2.2.0-a4/picotool/picotool",
2424
"args": [
2525
"load",
2626
"${command:raspberry-pi-pico.launchTargetPath}",
@@ -32,7 +32,7 @@
3232
},
3333
"problemMatcher": [],
3434
"windows": {
35-
"command": "${env:USERPROFILE}/.pico-sdk/picotool/2.0.0/picotool/picotool.exe"
35+
"command": "${env:USERPROFILE}/.pico-sdk/picotool/2.2.0-a4/picotool/picotool.exe"
3636
}
3737
},
3838
{

‎CMakeLists.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# == DO NOT EDIT THE FOLLOWING LINES for the Raspberry Pi Pico VS Code Extension to work ==
2-
if(WIN32)
3-
set(USERHOME $ENV{USERPROFILE})
4-
else()
5-
set(USERHOME $ENV{HOME})
6-
endif()
7-
set(sdkVersion 2.0.0)
8-
set(toolchainVersion 13_2_Rel1)
9-
set(picotoolVersion 2.0.0)
10-
set(picoVscode ${USERHOME}/.pico-sdk/cmake/pico-vscode.cmake)
11-
if (EXISTS ${picoVscode})
12-
include(${picoVscode})
13-
endif()
1+
# == DO NOT EDIT THE FOLLOWING LINES for the Raspberry Pi Pico VS Code Extension to work ==
2+
if(WIN32)
3+
set(USERHOME $ENV{USERPROFILE})
4+
else()
5+
set(USERHOME $ENV{HOME})
6+
endif()
7+
set(sdkVersion 2.2.0)
8+
set(toolchainVersion 14_2_Rel1)
9+
set(picotoolVersion 2.2.0-a4)
10+
set(picoVscode ${USERHOME}/.pico-sdk/cmake/pico-vscode.cmake)
11+
if (EXISTS ${picoVscode})
12+
include(${picoVscode})
13+
endif()
1414
# ====================================================================================
1515
cmake_minimum_required(VERSION 3.12)
1616

‎src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.12)
22

3-
set(PICO56_VERSION "0.5")
3+
set(PICO56_VERSION "0.6a")
44

55
string(REPLACE "." "-" PICO56_VERSION_STR "${PICO56_VERSION}")
66

‎submodules/sdcard‎

0 commit comments

Comments
 (0)