From f8bdbb62eb337cda62a4fcad5a2a4e6e9322d240 Mon Sep 17 00:00:00 2001
From: Rob Giseburt <giseburt@gmail.com>
Date: Mon, 4 Nov 2019 16:52:09 -0500
Subject: [PATCH] VSCode: Add OtherMill and OtherMillPro to build and debug
 configs

---
 .vscode/launch.json | 21 ++++++++++++--
 .vscode/tasks.json  | 70 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index d45dccbf..8873aef7 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,6 +4,7 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+
     {
       "name": "Debug CONFIG=fourcable (J-Link)",
       "type": "cortex-debug",
@@ -47,18 +48,32 @@
       "preLaunchTask": "Build CONFIG=ShapeokoDualY"
     },
     {
-      "name": "Debug CONFIG=MiniMill (J-Link)",
+      "name": "Debug CONFIG=Minimill (J-Link)",
       "type": "cortex-debug",
       "request": "launch",
       "servertype": "jlink",
       "cwd": "${workspaceRoot}/g2core/",
-      "executable": "./bin/MiniMill-g2v9k/g2core.elf",
+      "executable": "./bin/Minimill-g2v9k/g2core.elf",
       "device": "ATSAM3X8E",
       "interface": "swd",
       "showDevDebugOutput": false,
       "svdFile": "${workspaceRoot}/Motate/MotateProject/motate/cmsis/TARGET_Atmel/sam3x/ATSAM3X8E.svd",
       "armToolchainPath": "${workspaceRoot}/Motate/Tools/osx/gcc-arm-none-eabi-7u2/bin/",
-      "preLaunchTask": "Build CONFIG=MiniMill Debug"
+      "preLaunchTask": "Build CONFIG=Minimill Debug"
+    },
+    {
+      "name": "Debug CONFIG=OthermillPro (J-Link)",
+      "type": "cortex-debug",
+      "request": "launch",
+      "servertype": "jlink",
+      "cwd": "${workspaceRoot}/g2core/",
+      "executable": "./bin/OthermillPro-g2v9k/g2core.elf",
+      "device": "ATSAM3X8E",
+      "interface": "swd",
+      "showDevDebugOutput": false,
+      "svdFile": "${workspaceRoot}/Motate/MotateProject/motate/cmsis/TARGET_Atmel/sam3x/ATSAM3X8E.svd",
+      "armToolchainPath": "${workspaceRoot}/Motate/Tools/osx/gcc-arm-none-eabi-7u2/bin/",
+      "preLaunchTask": "Build CONFIG=OthermillPro Debug"
     },
     {
       "name": "Debug CONFIG=MiniMill Unity (J-Link)",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 23415ffe..d2cafae9 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -65,6 +65,76 @@
         "fileLocation": ["relative", "${workspaceRoot}/g2core"]
       }
     },
+    {
+      "label": "Build CONFIG=Othermill Debug",
+      "type": "process",
+      "command": "make",
+      "args": ["CONFIG=Othermill", "VERBOSE=2", "COLOR=0", "DEBUG=2",
+         "RECORD=1"],
+      "group": "build",
+      "problemMatcher": {
+        "base": "$gcc",
+        "fileLocation": ["relative", "${workspaceRoot}/g2core"]
+      }
+    },
+    {
+      "label": "Build CONFIG=Othermill Production",
+      "type": "process",
+      "command": "make",
+      "args": ["CONFIG=Othermill", "VERBOSE=2", "COLOR=0",
+         "RECORD=1"],
+      "group": "build",
+      "problemMatcher": {
+        "base": "$gcc",
+        "fileLocation": ["relative", "${workspaceRoot}/g2core"]
+      }
+    },
+    {
+      "label": "Clean CONFIG=Othermill",
+      "type": "process",
+      "command": "make",
+      "args": ["CONFIG=Othermill", "clean"],
+      "group": "build",
+      "problemMatcher": {
+        "base": "$gcc",
+        "fileLocation": ["relative", "${workspaceRoot}/g2core"]
+      }
+    },
+    {
+      "label": "Build CONFIG=OthermillPro Debug",
+      "type": "process",
+      "command": "make",
+      "args": ["CONFIG=OthermillPro", "VERBOSE=2", "COLOR=0", "DEBUG=2",
+         "RECORD=1"],
+      "group": "build",
+      "problemMatcher": {
+        "base": "$gcc",
+        "fileLocation": ["relative", "${workspaceRoot}/g2core"]
+      }
+    },
+    {
+      "label": "Build CONFIG=OthermillPro Production",
+      "type": "process",
+      "command": "make",
+      "args": ["CONFIG=OthermillPro", "VERBOSE=2", "COLOR=0",
+         "RECORD=1"],
+      "group": "build",
+      "problemMatcher": {
+        "base": "$gcc",
+        "fileLocation": ["relative", "${workspaceRoot}/g2core"]
+      }
+    },
+    {
+      "label": "Clean CONFIG=OthermillPro",
+      "type": "process",
+      "command": "make",
+      "args": ["CONFIG=OthermillPro", "clean"],
+      "group": "build",
+      "problemMatcher": {
+        "base": "$gcc",
+        "fileLocation": ["relative", "${workspaceRoot}/g2core"]
+      }
+    },
     {
       "label": "Build CONFIG=r7",
       "type": "process",