From 6bb3ea3c48ba364d0d141c054272b6141af55131 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 14 Jun 2019 09:17:19 -0400
Subject: [PATCH 1/2] vscode launch.json (debug configurations) cleanup naming
 and sort list

---
 .vscode/launch.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6c4ea15efdd5..67792a799670 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -2,7 +2,7 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "SITL shell",
+            "name": "Debug SITL (shell)",
             "type": "cppdbg",
             "request": "launch",
             "program": "${command:cmake.launchTargetPath}",
@@ -48,7 +48,7 @@
             }
         },
         {
-            "name": "SITL jmavsim iris",
+            "name": "Debug SITL (gazebo iris)",
             "type": "cppdbg",
             "request": "launch",
             "program": "${command:cmake.launchTargetPath}",
@@ -67,8 +67,9 @@
                     "value": "iris"
                 }
             ],
-            "preLaunchTask": "jmavsim",
-            "postDebugTask": "jmavsim kill",
+            "externalConsole": false,
+            "preLaunchTask": "gazebo iris",
+            "postDebugTask": "gazebo kill",
             "linux": {
                 "MIMode": "gdb",
                 "externalConsole": false,
@@ -96,7 +97,7 @@
             }
         },
         {
-            "name": "SITL gazebo iris",
+            "name": "Debug SITL (jmavsim iris)",
             "type": "cppdbg",
             "request": "launch",
             "program": "${command:cmake.launchTargetPath}",
@@ -115,9 +116,8 @@
                     "value": "iris"
                 }
             ],
-            "externalConsole": false,
-            "preLaunchTask": "gazebo iris",
-            "postDebugTask": "gazebo kill",
+            "preLaunchTask": "jmavsim",
+            "postDebugTask": "jmavsim kill",
             "linux": {
                 "MIMode": "gdb",
                 "externalConsole": false,
@@ -145,7 +145,7 @@
             }
         },
         {
-            "name": "px4_fmu-v2/v3/v4 (jlink)",
+            "name": "Debug px4_fmu-v2/v3/v4 (jlink)",
             "device": "STM32F427VI",
             "svdFile": "${workspaceRoot}/../cmsis-svd/data/STMicro/STM32F427.svd",
             "executable": "${command:cmake.launchTargetPath}",
@@ -165,7 +165,7 @@
             ]
         },
         {
-            "name": "px4_fmu-v4pro (jlink)",
+            "name": "Debug px4_fmu-v4pro (jlink)",
             "device": "STM32F469VI",
             "svdFile": "${workspaceRoot}/../cmsis-svd/data/STMicro/STM32F469.svd",
             "executable": "${command:cmake.launchTargetPath}",
@@ -184,7 +184,7 @@
             ]
         },
         {
-            "name": "px4_fmu-v5 (jlink)",
+            "name": "Debug px4_fmu-v5 (jlink)",
             "device": "STM32F765VI",
             "svdFile": "${workspaceRoot}/../cmsis-svd/data/STMicro/STM32F7x5.svd",
             "executable": "${command:cmake.launchTargetPath}",

From 0684d66067a55208070975af3d123ded377ee723 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 14 Jun 2019 09:18:03 -0400
Subject: [PATCH 2/2] vscode launch.json add black magic probe debug config

---
 .vscode/launch.json | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 67792a799670..0ea751052234 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -164,6 +164,27 @@
                 "showtasks",
             ]
         },
+        {
+            "name": "Debug px4_fmu-v2/v3/v4 (blackmagic)",
+            "device": "STM32F427VI",
+            "svdFile": "${workspaceRoot}/../cmsis-svd/data/STMicro/STM32F427.svd",
+            "executable": "${command:cmake.launchTargetPath}",
+            "request": "launch",
+            "type": "cortex-debug",
+            "servertype": "bmp",
+            "BMPGDBSerialPort": "/dev/ttyACM0",
+            "interface": "swd",
+            "cwd": "${workspaceRoot}",
+            "internalConsoleOptions": "openOnSessionStart",
+            "preLaunchCommands": [
+                "source ${workspaceRoot}/platforms/nuttx/Debug/PX4",
+                "source ${workspaceRoot}/platforms/nuttx/Debug/NuttX",
+                "source ${workspaceRoot}/platforms/nuttx/Debug/ARMv7M",
+                "set mem inaccessible-by-default off",
+                "set print pretty",
+                "showtasks",
+            ]
+        },
         {
             "name": "Debug px4_fmu-v4pro (jlink)",
             "device": "STM32F469VI",