Merge branch 'main' into ci/platform_mods

UCSD-E4E · Dec 21, 2024 · a80a3ad · a80a3ad
2 parents 782972c + 35f29c0
commit a80a3ad
Showing 1 changed file with 2 additions and 30 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -18,13 +18,11 @@
             "request": "attach",
             "servertype": "openocd",
             "name": "Particle Debugger",
-            "showDevDebugOutput": "raw",
             "cwd": "${workspaceRoot}",
             "rtos": "FreeRTOS",
             "armToolchainPath": "${command:particle.getDebuggerCompilerDir}",
             "executable": "${command:particle.getDebuggerExecutable}",
             "serverpath": "${command:particle.getDebuggerOpenocdPath}",
-            "preLaunchTask": "Particle: Flash application for debug (local)",
             "searchDir": [
                 "${command:particle.getDebuggerSearchDir}"
             ],
@@ -35,35 +33,10 @@
                 "${command:particle.getDebuggerPostAttachCommands}"
             ],
             "particle": {
-                "version": "1.0.1",
+                "version": "1.1.0",
                 "debugger": "particle-debugger"
             }
         },
-        {
-            "type": "cortex-debug",
-            "request": "attach",
-            "servertype": "openocd",
-            "name": "Particle Programmer Shield",
-            "cwd": "${workspaceRoot}",
-            "rtos": "FreeRTOS",
-            "armToolchainPath": "${command:particle.getDebuggerCompilerDir}",
-            "executable": "${command:particle.getDebuggerExecutable}",
-            "serverpath": "${command:particle.getDebuggerOpenocdPath}",
-            "preLaunchTask": "Particle: Flash application for debug (local)",
-            "searchDir": [
-                "${command:particle.getDebuggerSearchDir}"
-            ],
-            "configFiles": [
-                "${command:particle.getDebuggerConfigFiles}"
-            ],
-            "postAttachCommands": [
-                "${command:particle.getDebuggerPostAttachCommands}"
-            ],
-            "particle": {
-                "version": "1.0.1",
-                "debugger": "particle-programmer-shield"
-            }
-        },
         {
             "type": "cortex-debug",
             "request": "attach",
@@ -74,7 +47,6 @@
             "armToolchainPath": "${command:particle.getDebuggerCompilerDir}",
             "executable": "${command:particle.getDebuggerExecutable}",
             "serverpath": "${command:particle.getDebuggerOpenocdPath}",
-            "preLaunchTask": "Particle: Flash application for debug (local)",
             "searchDir": [
                 "${command:particle.getDebuggerSearchDir}"
             ],
@@ -85,7 +57,7 @@
                 "${command:particle.getDebuggerPostAttachCommands}"
             ],
             "particle": {
-                "version": "1.0.1",
+                "version": "1.1.0",
                 "debugger": "generic-cmsis-dap"
             }
         }