Skip to content

Commit 119b7f7

Browse files
committed
Add support for SDK 2.2.0
1 parent 7a7664e commit 119b7f7

File tree

7 files changed

+139
-9
lines changed

7 files changed

+139
-9
lines changed

data/0.17.0/github-cache.json

Lines changed: 121 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"1.5.1",
44
"2.0.0",
55
"2.1.0",
6-
"2.1.1"
6+
"2.1.1",
7+
"2.2.0"
78
],
89
"githubApiCache-0-1-1.5.1": {
910
"assets": [
@@ -45,6 +46,16 @@
4546
],
4647
"assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk/releases/200593058/assets"
4748
},
49+
"githubApiCache-0-1-2.2.0": {
50+
"assets": [
51+
{
52+
"id": 277391290,
53+
"name": "pico-sdk-2.2.0.tar.gz",
54+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk/releases/download/2.2.0/pico-sdk-2.2.0.tar.gz"
55+
}
56+
],
57+
"assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk/releases/235925916/assets"
58+
},
4859
"githubApiCache-1-0": [
4960
"v3.28.6",
5061
"v3.29.6",
@@ -494,7 +505,8 @@
494505
"v2.0.0-5",
495506
"v2.1.0-0",
496507
"v2.1.1-1",
497-
"v2.1.1-3"
508+
"v2.1.1-3",
509+
"v2.2.0-0"
498510
],
499511
"githubApiCache-3-1-v1.5.1-0": {
500512
"assets": [
@@ -1206,10 +1218,106 @@
12061218
],
12071219
"assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk-tools/releases/233179600/assets"
12081220
},
1221+
"githubApiCache-3-1-v2.2.0-0": {
1222+
"assets": [
1223+
{
1224+
"id": 279210754,
1225+
"name": "openocd-0.12.0+dev-aarch64-lin.tar.gz",
1226+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/openocd-0.12.0%2Bdev-aarch64-lin.tar.gz"
1227+
},
1228+
{
1229+
"id": 279202011,
1230+
"name": "openocd-0.12.0+dev-arm64-mac.zip",
1231+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/openocd-0.12.0%2Bdev-arm64-mac.zip"
1232+
},
1233+
{
1234+
"id": 279218189,
1235+
"name": "openocd-0.12.0+dev-x64-win.zip",
1236+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/openocd-0.12.0%2Bdev-x64-win.zip"
1237+
},
1238+
{
1239+
"id": 279201774,
1240+
"name": "openocd-0.12.0+dev-x86_64-lin.tar.gz",
1241+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/openocd-0.12.0%2Bdev-x86_64-lin.tar.gz"
1242+
},
1243+
{
1244+
"id": 279211865,
1245+
"name": "openocd-0.12.0+dev-x86_64-mac.zip",
1246+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/openocd-0.12.0%2Bdev-x86_64-mac.zip"
1247+
},
1248+
{
1249+
"id": 279210753,
1250+
"name": "pico-sdk-tools-2.2.0-aarch64-lin.tar.gz",
1251+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/pico-sdk-tools-2.2.0-aarch64-lin.tar.gz"
1252+
},
1253+
{
1254+
"id": 279202009,
1255+
"name": "pico-sdk-tools-2.2.0-mac.zip",
1256+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/pico-sdk-tools-2.2.0-mac.zip"
1257+
},
1258+
{
1259+
"id": 279218186,
1260+
"name": "pico-sdk-tools-2.2.0-x64-win.zip",
1261+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/pico-sdk-tools-2.2.0-x64-win.zip"
1262+
},
1263+
{
1264+
"id": 279201773,
1265+
"name": "pico-sdk-tools-2.2.0-x86_64-lin.tar.gz",
1266+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/pico-sdk-tools-2.2.0-x86_64-lin.tar.gz"
1267+
},
1268+
{
1269+
"id": 279210751,
1270+
"name": "picotool-2.2.0-aarch64-lin.tar.gz",
1271+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/picotool-2.2.0-aarch64-lin.tar.gz"
1272+
},
1273+
{
1274+
"id": 279202012,
1275+
"name": "picotool-2.2.0-mac.zip",
1276+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/picotool-2.2.0-mac.zip"
1277+
},
1278+
{
1279+
"id": 279218187,
1280+
"name": "picotool-2.2.0-x64-win.zip",
1281+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/picotool-2.2.0-x64-win.zip"
1282+
},
1283+
{
1284+
"id": 279201776,
1285+
"name": "picotool-2.2.0-x86_64-lin.tar.gz",
1286+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/picotool-2.2.0-x86_64-lin.tar.gz"
1287+
},
1288+
{
1289+
"id": 279210752,
1290+
"name": "riscv-toolchain-15-aarch64-lin.tar.gz",
1291+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/riscv-toolchain-15-aarch64-lin.tar.gz"
1292+
},
1293+
{
1294+
"id": 279202010,
1295+
"name": "riscv-toolchain-15-arm64-mac.zip",
1296+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/riscv-toolchain-15-arm64-mac.zip"
1297+
},
1298+
{
1299+
"id": 279218188,
1300+
"name": "riscv-toolchain-15-x64-win.zip",
1301+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/riscv-toolchain-15-x64-win.zip"
1302+
},
1303+
{
1304+
"id": 279201775,
1305+
"name": "riscv-toolchain-15-x86_64-lin.tar.gz",
1306+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/riscv-toolchain-15-x86_64-lin.tar.gz"
1307+
},
1308+
{
1309+
"id": 279211866,
1310+
"name": "riscv-toolchain-15-x86_64-mac.zip",
1311+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/riscv-toolchain-15-x86_64-mac.zip"
1312+
}
1313+
],
1314+
"assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk-tools/releases/237302885/assets"
1315+
},
12091316
"githubApiCache-4-0": [
12101317
"2.0.0",
12111318
"2.1.0",
1212-
"2.1.1"
1319+
"2.1.1",
1320+
"2.2.0"
12131321
],
12141322
"githubApiCache-4-1-2.0.0": {
12151323
"assets": [
@@ -1240,5 +1348,15 @@
12401348
}
12411349
],
12421350
"assetsUrl": "https://api.github.com/repos/raspberrypi/picotool/releases/201010176/assets"
1351+
},
1352+
"githubApiCache-4-1-2.2.0": {
1353+
"assets": [
1354+
{
1355+
"id": 277389526,
1356+
"name": "picotool-2.2.0.tar.gz",
1357+
"browser_download_url": "https://github.com/raspberrypi/picotool/releases/download/2.2.0/picotool-2.2.0.tar.gz"
1358+
}
1359+
],
1360+
"assetsUrl": "https://api.github.com/repos/raspberrypi/picotool/releases/235923337/assets"
12431361
}
12441362
}

data/0.17.0/versionBundles.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,12 @@
3333
"picotool": "2.1.1",
3434
"toolchain": "14_2_Rel1",
3535
"riscvToolchain": "RISCV_RPI_2_0_0_5"
36+
},
37+
"2.2.0": {
38+
"ninja": "v1.12.1",
39+
"cmake": "v3.31.5",
40+
"picotool": "2.2.0",
41+
"toolchain": "14_2_Rel1",
42+
"riscvToolchain": "RISCV_RPI_2_1_1_3"
3643
}
3744
}

scripts/genCache.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
# Only provide data for these versions
4949
versions = [
50-
["1.5.1", "2.0.0", "2.1.0", "2.1.1"], # SDK
50+
["1.5.1", "2.0.0", "2.1.0", "2.1.1", "2.2.0"], # SDK
5151
["v3.28.6", "v3.29.6", "v3.29.9", "v3.31.5"], # CMake
5252
["v1.12.1"], # Ninja
5353
[
@@ -61,8 +61,9 @@
6161
"v2.1.0-0",
6262
"v2.1.1-1",
6363
"v2.1.1-3",
64+
"v2.2.0-0",
6465
], # pico-sdk-tools
65-
["2.0.0", "2.1.0", "2.1.1"], # picotool
66+
["2.0.0", "2.1.0", "2.1.1", "2.2.0"], # picotool
6667
]
6768

6869
headers = {

scripts/genExamples.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
CURRENT_DATA_VERSION = "0.17.0"
3939

40-
SDK_VERSION_DEFAULT = "2.1.1"
40+
SDK_VERSION_DEFAULT = "2.2.0"
4141
ARM_TOOLCHAIN_VERSION_DEFAULT = "14_2_Rel1"
4242
RISCV_TOOLCHAIN_VERSION_DEFAULT = "RISCV_ZCB_RPI_2_1_1_3"
4343

src/commands/switchSDK.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ export default class SwitchSDKCommand extends Command {
744744
workspaceFolder.uri,
745745
selectedSDK.sdk,
746746
selectedToolchain.toolchain.version,
747-
selectedPicotool ?? "2.1.1"
747+
selectedPicotool ?? "2.2.0"
748748
);
749749

750750
progress.report({

src/utils/download.mts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ const TOOLS_RELEASES: { [key: string]: string } = {
7171
"2.1.0": "v2.1.0-0",
7272
// eslint-disable-next-line @typescript-eslint/naming-convention
7373
"2.1.1": "v2.1.1-1",
74+
// eslint-disable-next-line @typescript-eslint/naming-convention
75+
"2.2.0": "v2.2.0-0",
7476
};
7577

7678
/// Release tags for picotool
@@ -81,6 +83,8 @@ const PICOTOOL_RELEASES: { [key: string]: string } = {
8183
"2.1.0": "v2.1.0-0",
8284
// eslint-disable-next-line @typescript-eslint/naming-convention
8385
"2.1.1": "v2.1.1-1",
86+
// eslint-disable-next-line @typescript-eslint/naming-convention
87+
"2.2.0": "v2.2.0-0",
8488
};
8589

8690
/// Release tags for openocd

src/utils/examplesUtil.mts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ const EXAMPLES_REPOSITORY_URL =
2121
const EXAMPLES_JSON_URL =
2222
"https://raspberrypi.github.io/pico-vscode/" +
2323
`${CURRENT_DATA_VERSION}/examples.json`;
24-
const EXAMPLES_GITREF = "84e8d489ca321a4be90ee49e36dc29e5c645da08";
25-
const EXAMPLES_TAG = "sdk-2.1.1";
24+
const EXAMPLES_GITREF = "4c3a3dc0196dd426fddd709616d0da984e027bab";
25+
const EXAMPLES_TAG = "sdk-2.2.0";
2626

2727
export interface Example {
2828
path: string;

0 commit comments

Comments
 (0)