Add elf2uf2 and pioasm for sdk 1.5.1

[pico-vscode.git] / scripts / pico_project.py

diff --git a/scripts/pico_project.py b/scripts/pico_project.py
index c784395ff28fdf521b808d20b1f0451b38fd60af..d48e7818cac44fd7c10398511d2b661f81d45939 100644 (file)
--- a/scripts/pico_project.py
+++ b/scripts/pico_project.py
@@ -230,12 +230,18 @@ def relativeSDKPath(sdkVersion):
 def relativeToolchainPath(toolchainVersion):
     return f"/.pico-sdk/toolchain/{toolchainVersion}"
 
+def relativeToolsPath(sdkVersion):
+    return f"/.pico-sdk/tools/{sdkVersion}"
+
 def cmakeSdkPath(sdkVersion):
     return f"${{USERHOME}}{relativeSDKPath(sdkVersion)}"
 
 def cmakeToolchainPath(toolchainVersion):
     return f"${{USERHOME}}{relativeToolchainPath(toolchainVersion)}"
 
+def cmakeToolsPath(sdkVersion):
+    return f"${{USERHOME}}{relativeToolsPath(sdkVersion)}"
+
 def propertiesSdkPath(sdkVersion):
     if isWindows:
         return f"${{env:USERPROFILE}}{relativeSDKPath(sdkVersion)}"
@@ -1052,6 +1058,11 @@ def GenerateCMake(folder, params):
                  "endif()\n"
                  f"set(PICO_SDK_PATH {cmakeSdkPath(params['sdkVersion'])})\n"
                  f"set(PICO_TOOLCHAIN_PATH {cmakeToolchainPath(params['toolchainVersion'])})\n"
+                 "if(WIN32)\n"
+                 f"    set(pico-sdk-tools_DIR {cmakeToolsPath(params['sdkVersion'])})\n"
+                 "    include(${pico-sdk-tools_DIR}/pico-sdk-tools-config.cmake)\n"
+                 "    include(${pico-sdk-tools_DIR}/pico-sdk-tools-config-version.cmake)\n"
+                 "endif()\n"
                  "# ====================================================================================\n"
                  f"set(PICO_BOARD {board_type} CACHE STRING \"Board type\")\n\n"
                  "# Pull in Raspberry Pi Pico SDK (must be before project)\n"
@@ -1276,6 +1287,7 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
 }}
 '''
 
+            pythonExe = sys.executable.replace("\\", "/").replace(user_home, "${HOME}") if use_home_var else sys.executable
 
             # settings
             settings = f'''{{
@@ -1291,7 +1303,7 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
 
             if customPython:
                 settings += f''',
-    "raspberry-pi-pico.python3Path": "{sys.executable.replace(user_home, "${HOME}") if use_home_var else sys.executable}"'''
+    "raspberry-pi-pico.python3Path": "{pythonExe}"'''
                 
             settings += '\n}\n'