From c2ad9d01a6d0c0422a610f820041c85991062eb2 Mon Sep 17 00:00:00 2001
From: Rob Giseburt <giseburt@gmail.com>
Date: Sun, 26 Jul 2020 15:18:48 -0500
Subject: [PATCH] minor VSCode and boards cleanup

---
 .gitignore          |  1 +
 .vscode/launch.json | 76 +++++++++++++++++++++++++++++++++++++++++++--
 .vscode/tasks.json  | 12 +++++++
 g2core/boards.mk    |  2 +-
 4 files changed, 87 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d57872f63..621f28544 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@ g2core/compile_commands.json
 .vscode/.cortex-debug.registers.state.json
 .vscode/.cortex-debug.peripherals.state.json
 .vscode/ipch
+g2core.code-workspace
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 037c960e8..652cc97fd 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -118,6 +118,76 @@
       },
       "preLaunchTask": "Build CONFIG=MiniMill Debug"
     },
+    {
+      "name": "Debug CONFIG=MiniMill Quintic revG (J-Link/Semihosting)",
+      "type": "cortex-debug",
+      "request": "launch",
+      "servertype": "jlink",
+      "cwd": "${workspaceRoot}/g2core/",
+      "executable": "./bin/MiniMill-gquintic-g/g2core.elf",
+      "device": "ATSAMS70N20",
+      "svdFile": "${workspaceRoot}/Motate/MotateProject/motate/cmsis/TARGET_Atmel/sams70/ATSAMS70N20B.svd",
+      "interface": "swd",
+      "showDevDebugOutput": false,
+      "osx": {
+        "armToolchainPath": "${workspaceRoot}/Motate/Tools/osx/gcc-arm-none-eabi-7u2/bin/"
+      },
+      "linux": {
+        "armToolchainPath": "${workspaceRoot}/Motate/Tools/linux/gcc-arm-none-eabi-9m/bin/"
+      },
+      "swoConfig": {
+        "enabled": true,
+        "source":"probe",
+        "swoFrequency": 8000000,
+        "decoders": [
+          {
+            "port": 0,
+            "type": "console",
+            "label": "SWO output",
+            "encoding": "ascii"
+          }
+        ]
+        // "decoders": [
+        //   {
+        //     "type": "graph",
+        //     "port": 0,
+        //     "encoding": "float",
+        //     "graphId": "1",
+        //     "scale": 1
+        //   },
+        //   {
+        //     "type": "graph",
+        //     "port": 1,
+        //     "encoding": "float",
+        //     "graphId": "2",
+        //     "scale": 1
+        //   },
+        // ],
+      },
+      // "graphConfig": [
+      //   {
+      //     "label": "Graph 1",
+      //     "timespan": 5,
+      //     "type": "realtime",
+      //     "annotate": false,
+      //     "maximum": 1,
+      //     "minimum": 0,
+      //     "plots": [
+      //       {
+      //         "graphId": "1",
+      //         "label": "data 1",
+      //         "color": "#53753c"
+      //       },
+      //       {
+      //         "graphId": "2",
+      //         "label": "1.0-data 1",
+      //         "color": "#3557c3"
+      //       },
+      //     ]
+      //   },
+      // ],
+      "preLaunchTask": "Build CONFIG=MiniMill DebugSemihosting"
+    },
     {
       "name": "Debug CONFIG=MiniMill Quintic revG (J-Link)",
       "type": "cortex-debug",
@@ -181,9 +251,9 @@
       "request": "launch",
       "servertype": "jlink",
       "cwd": "${workspaceRoot}/g2core/",
-      "executable": "./bin/AxiDrawv3-quint-gquintic-d/g2core.elf",
-      "device": "ATSAMS70N19",
-      "svdFile": "${workspaceRoot}/Motate/MotateProject/motate/cmsis/TARGET_Atmel/sams70/ATSAMS70N19.svd",
+      "executable": "./bin/AxiDrawv3-quint-gquintic-g/g2core.elf",
+      "device": "ATSAMS70N20",
+      "svdFile": "${workspaceRoot}/Motate/MotateProject/motate/cmsis/TARGET_Atmel/sams70/ATSAMS70N20B.svd",
       "interface": "swd",
       "showDevDebugOutput": false,
       "osx": {
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index b924166aa..e5106ce6b 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -42,6 +42,18 @@
         "fileLocation": ["relative", "${workspaceRoot}/g2core"]
       }
     },
+    {
+      "label": "Build CONFIG=MiniMill DebugSemihosting",
+      "type": "process",
+      "command": "make",
+      "args": ["CONFIG=MiniMill", "VERBOSE=2", "COLOR=0", "DEBUG=3",
+         "RECORD=1"],
+      "group": "build",
+      "problemMatcher": {
+        "base": "$gcc",
+        "fileLocation": ["relative", "${workspaceRoot}/g2core"]
+      }
+    },
     {
       "label": "Build CONFIG=MiniMill Production",
       "type": "process",
diff --git a/g2core/boards.mk b/g2core/boards.mk
index e951d23d6..0b218cca5 100644
--- a/g2core/boards.mk
+++ b/g2core/boards.mk
@@ -231,7 +231,7 @@ ifeq ("$(CONFIG)","AxiDrawv3")
 endif
 ifeq ("$(CONFIG)","AxiDrawv3-quint")
     ifeq ("$(BOARD)","NONE")
-        BOARD=gquintic-d
+        BOARD=gquintic-g
     endif
     SETTINGS_FILE="settings_axidraw_v3.h"
 endif