Merge branch 'main' into main

diff --cc scripts/pico_project.py
Simple merge

diff --cc src/utils/cmakeUtil.mts
index 0062f5e41f44b78e923fbf02c520d292979def6d,a1e4e8843500a6641b8d2610ec194f86c5f538ea..4a4c7fb841e6290d60c8473cea16e5e4cb38ceae
--- 1/src/utils/cmakeUtil.mts
--- 2/src/utils/cmakeUtil.mts
+++ b/src/utils/cmakeUtil.mts
@@@ -337,11 -340,8 +340,11 @@@ export async function cmakeUpdateSDK
          "endif()\n" +
          `set(sdkVersion ${newSDKVersion})\n` +
          `set(toolchainVersion ${newToolchainVersion})\n` +
-         `set(picotoolVersion ${picotoolVersion})\n` +
+         `set(picotoolVersion ${newPicotoolVersion})\n` +
 -        `include(${buildCMakeIncPath(false)}/pico-vscode.cmake)\n` +
 +        `set(picoVscode ${buildCMakeIncPath(false)}/pico-vscode.cmake)\n` +
 +        "if (EXISTS ${picoVscode})\n" +
 +        "    include(${picoVscode})\n" +
 +        "endif()\n" +
          // eslint-disable-next-line max-len
          "# ===================================================================================="
        );