diff --git a/.vscode/launch.json b/.vscode/launch.json
index 5179614..b6006d5 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,41 +1,54 @@
 {
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Debug (PicoProbe - OpenOCD)",
-            "cwd": "${workspaceRoot}",
-            "executable": "${command:cmake.launchTargetPath}",
-            "request": "launch",
-            "type": "cortex-debug",
-            "servertype": "openocd",
-            // This may need to be arm-none-eabi-gdb depending on your system
-            "gdbPath" : "${env:PICO_GDB}",
-            "device": "RP2040",
-            "configFiles": [
-                "interface/cmsis-dap.cfg",
-                "target/rp2040.cfg"
-            ],
-            "svdFile": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd",
-            "runToMain": true,
-            // Work around for stopping at main on restart
-            "postRestartCommands": [
-                "break main",
-                "continue"
-            ]
-        },
-        {
-            "name": "Debug (J-Link)",
-            "cwd": "${workspaceRoot}",
-            "executable": "${command:cmake.launchTargetPath}",
-            "request": "launch",
-            "type": "cortex-debug",
-            "serverpath": "C:/Program Files/SEGGER/JLink_V782d/JLinkGDBServerCL.exe",
-            "servertype": "jlink",
-            "gdbPath": "${env:PICO_GDB}",
-            "device": "RP2040_M0_0",
-            "interface": "swd",
-            "svdFile": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd",
-            "runToEntryPoint": "main"
-        }
-    ]
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Debug (BMP - OnChip-GDB)",
+			"cwd": "${workspaceRoot}",
+			"executable": "${command:cmake.launchTargetPath}",
+			"request": "launch",
+			"type": "cortex-debug",
+			"servertype": "bmp",
+			"device": "RP2040",
+			// Windows for COM1-COM9 -> COM4
+			// Windows for COM10-XXX -> \\.\COM20
+			// Unix -> /dev/ttyACM0
+			"BMPGDBSerialPort": "\\\\.\\COM20",
+			//"showDevDebugOutput": "raw",
+			"svdFile": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd",
+			// Work around for stopping at main on restart
+			"runToEntryPoint": "main"
+		},
+		{
+			"name": "Debug (PicoProbe - OpenOCD)",
+			"cwd": "${workspaceRoot}",
+			"executable": "${command:cmake.launchTargetPath}",
+			"request": "launch",
+			"type": "cortex-debug",
+			"servertype": "openocd",
+			// This may need to be arm-none-eabi-gdb depending on your system
+			"gdbPath" : "${env:PICO_GDB}",
+			"device": "RP2040",
+			"configFiles": [
+				"interface/cmsis-dap.cfg",
+				"target/rp2040.cfg"
+			],
+			"svdFile": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd",
+			// Work around for stopping at main on restart
+			"runToEntryPoint": "main"
+		},
+		{
+			"name": "Debug (J-Link)",
+			"cwd": "${workspaceRoot}",
+			"executable": "${command:cmake.launchTargetPath}",
+			"request": "launch",
+			"type": "cortex-debug",
+			"serverpath": "C:/Program Files/SEGGER/JLink_V782d/JLinkGDBServerCL.exe",
+			"servertype": "jlink",
+			"gdbPath": "${env:PICO_GDB}",
+			"device": "RP2040_M0_0",
+			"interface": "swd",
+			"svdFile": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd",
+			"runToEntryPoint": "main"
+		}
+	]
 }