Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker

1 files changed, 19 insertions, 1 deletions

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7cf3acd..3d9aa78 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -40,7 +40,25 @@
                 "break main",
                 "continue"
             ]
+        },
+        {
+            "cwd": "${workspaceRoot}",
+            // TODO: find better way to get latest build filename
+            "executable": "./build/src/pinetime-app-1.3.0.out",
+            "name": "Debug OpenOCD ST-LINK pinetime-app-1.3.0.out",
+            "request": "launch",
+            "type": "cortex-debug",
+            "showDevDebugOutput": false,
+            "servertype": "openocd",
+            "runToMain": true,
+            // Only use armToolchainPath if your arm-none-eabi-gdb is not in your path (some GCC packages does not contain arm-none-eabi-gdb)
+            "armToolchainPath": "${workspaceRoot}/../gcc-arm-none-eabi-9-2020-q2-update/bin",
+            "svdFile": "${workspaceRoot}/nrf52.svd",
+            "configFiles": [
+                "interface/stlink.cfg",
+                "target/nrf52.cfg"
+            ],
         }
 
     ]
-}
\ No newline at end of file
+}