removed NewProject example, and updated tasks for mono-example approach.

.vscode/launch.json

@@ -31,38 +31,6 @@
       "showDevDebugOutput": true,
       "svdFile": "${workspaceRoot}/.vscode/STM32H750x.svd",
       "type": "cortex-debug"
-    },
-    {
-      "configFiles": [
-        "interface/stlink.cfg",
-        "target/stm32h7x.cfg"
-      ],
-      "cwd": "${workspaceFolder}",
-      "debuggerArgs": [
-        "-d",
-        "${workspaceRoot}"
-      ],
-      // Here's where you can put the path to the program you want to debug:
-      "executable": "${workspaceRoot}/NewProject/build/NewProject.elf",
-      "interface": "swd",
-      "name": "Debug NewProject",
-      "openOCDLaunchCommands": [
-        "init",
-        "reset init",
-        "gdb_breakpoint_override hard"
-      ],
-      "preLaunchTask": "Build Blink",
-      "preRestartCommands": [
-        "load",
-        "enable breakpoint",
-        "monitor reset"
-      ],
-      "request": "launch",
-      "runToMain": true,
-      "servertype": "openocd",
-      "showDevDebugOutput": true,
-      "svdFile": "${workspaceRoot}/.vscode/STM32H750x.svd",
-      "type": "cortex-debug"
     }
   ],
   "version": "0.2.0"

.vscode/tasks.json

@@ -10,7 +10,7 @@
       "type": "shell"
     },
     {
-      "label": "Build Blink",
+      "label": "Build",
       "command": "make",
       "options": {
         "cwd": "${workspaceFolder}/Blink"
@@ -19,29 +19,17 @@
       "type": "shell"
     },
     {
-      "label": "Build NewProject",
+      "label": "Clean",
-      "command": "make",
+      "command": "make clean",
       "options": {
-        "cwd": "${workspaceFolder}/NewProject"
+        "cwd": "${workspaceFolder}/Blink"
       },
       "problemMatcher": [],
       "type": "shell"
     },
     {
-      "label": "Build",
+      "label": "Program DFU",
-      "dependsOn": [
+      "command": "make program-dfu",
-        "Build Blink",
-        "Build NewProject"
-      ],
-      "problemMatcher": [],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
-    },
-    {
-      "label": "Clean Blink",
-      "command": "make clean",
       "options": {
         "cwd": "${workspaceFolder}/Blink"
       },
@@ -49,21 +37,13 @@
       "type": "shell"
     },
     {
-      "label": "Clean NewProject",
+      "label": "Rebuild and Program DFU",
-      "command": "make clean",
+      "command": "make clean; make; make program-dfu",
       "options": {
-        "cwd": "${workspaceFolder}/NewProject"
+        "cwd": "${workspaceFolder}/Blink"
       },
       "problemMatcher": [],
       "type": "shell"
-    },
-    {
-      "label": "Clean",
-      "dependsOn": [
-        "Clean Blink",
-        "Clean NewProject"
-      ],
-      "problemMatcher": [],
     }
   ],
   "version": "2.0.0"

NewProject/Makefile

@@ -1,22 +0,0 @@
-# Project Name
-TARGET = Blink
-
-# Configure for debugging
-# common configurations:
-# use DEBUG = 1 and OPT = -Og for debugging
-# or DEBUG = 0 and OPT = -O3 for performance
-DEBUG = 0
-OPT = -O3
-
-# Sources
-CPP_SOURCES = main.cpp
-
-LIBDAISY_DIR = ../libs/libDaisy
-DAISYSP_DIR = ../libs/DaisySP
-
-# (optional) Includes FatFS source files within project.
-#USE_FATFS = 1
-
-# Core location, and generic Makefile.
-SYSTEM_FILES_DIR = $(LIBDAISY_DIR)/core
-include $(SYSTEM_FILES_DIR)/Makefile

NewProject/main.cpp

@@ -1,15 +0,0 @@
-/** Basic Daisy Program
- *
- *  This file is a blank starting point for a new project.
- */
-#include "daisy_seed.h"
-
-using namespace daisy;
-
-DaisySeed hw;
-
-int main() {
-  hw.Init();
-  while (1) {
-  }
-}