From 874c673604446bc5e27d354826a7deaef2b12654 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 20 Oct 2020 13:16:10 +0200
Subject: [PATCH] vscode

---
 .vscode/launch.json |  2 +-
 .vscode/tasks.json  | 21 +++++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index f115c5c7e..d3d86ee80 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -37,7 +37,7 @@
                     "ignoreFailures": true
                 }
             ],
-            "preLaunchTask": "Debug: clean & make client",
+            "preLaunchTask": "client: Debug: clean & make",
             "miDebuggerPath": "/usr/bin/gdb"
         }
     ],
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 352f22a42..155aa80cd 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,7 +4,7 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Make all & run",
+            "label": "all: Make & run",
             "type": "shell",
             "command": "make -j && ./pm3",
             "problemMatcher": [
@@ -16,7 +16,7 @@
             }
         },
         {
-            "label": "Make TARGET",
+            "label": "choose: Make",
             "type": "shell",
             "command": "make ${input:componentType} -j",
             "problemMatcher": [
@@ -25,7 +25,7 @@
             "group": "build",
         },
         {
-            "label": "Debug: make client",
+            "label": "client: Debug: make",
             "type": "shell",
             "command": "make client -j DEBUG=1",
             "problemMatcher": [
@@ -34,7 +34,7 @@
             "group": "build",
         },
         {
-            "label": "Debug: clean & make client",
+            "label": "client: Debug: clean & make",
             "type": "shell",
             "command": "make client/clean && make client -j DEBUG=1",
             "problemMatcher": [
@@ -43,25 +43,22 @@
             "group": "build",
         },
         {
-            "label": "Flash fullimage",
+            "label": "fullimage: Make & Flash",
             "type": "shell",
-            "command": "./pm3-flash-fullimage",
+            "command": "make fullimage && ./pm3-flash-fullimage",
             "problemMatcher": []
         },
         {
-            "label": "FLASH BOOTROM",
+            "label": "BOOTROM: Make & Flash",
             "type": "shell",
-            "command": "./pm3-flash-bootrom",
+            "command": "make bootrom && ./pm3-flash-bootrom",
             "problemMatcher": []
         },
         {
             "label": "Run client",
             "type": "shell",
             "command": "./pm3",
-            "problemMatcher": [],
-            "dependsOn": [
-                "Release: build client"
-            ]
+            "problemMatcher": []
         }
     ],
     "inputs": [