Sync pre-made projects

analogdevicesinc · Jun 10, 2021 · 3a4782e · 3a4782e
1 parent 016ce37
commit 3a4782e
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 14 deletions.
diff --git a/MaximLP/New_Project/.vscode/launch.json b/MaximLP/New_Project/.vscode/launch.json
@@ -6,7 +6,7 @@
             "request": "launch",
             "program": "${workspaceFolder}/build/${config:target}.elf",
             "args": [],
-            "stopAtEntry": false,
+            "stopAtEntry": true,
             "cwd": "${workspaceFolder}",
             "environment": [],
             "externalConsole": false,
@@ -17,7 +17,7 @@
             "setupCommands": [
                 {
                     "description": "Launch OpenOCD from within GDB via pipe connection",
-                    "text": "target remote | openocd -c \"gdb_port pipe;log_output openocd.log\" -s ${config:MAXIM_PATH}/Toolchain/share/openocd/scripts -f interface/cmsis-dap.cfg -f target/${config:target}.cfg",
+                    "text": "target remote | openocd -c \"gdb_port pipe;log_output openocd.log\" -s ${config:MAXIM_PATH}/Toolchain/share/openocd/scripts -f interface/${config:debugger}.cfg -f target/${config:target}.cfg",
                     "ignoreFailures": false
                 },
                 {

diff --git a/MaximLP/New_Project/.vscode/settings.json b/MaximLP/New_Project/.vscode/settings.json
@@ -3,8 +3,29 @@
         "Path":"${config:MAXIM_PATH}/Toolchain/bin;${config:MAXIM_PATH}/Toolchain/msys/1.0/bin;${env:Path}"  
     },
 
-    "MAXIM_PATH":"C:/Maxim",
+    "MAXIM_PATH":"C:/Maxim", //<-- This is the root installation directory of the Maxim Micros Toolchain.  Change this if you used a non-default installation location.
 
-    "target":"MAX32665"
+    "target":"MAX32665",/*<-- Change to the correct target micro.
+    Options :
+    "MAX3263x"
+    "MAX32600"
+    "MAX32620"
+    "MAX32625"
+    "MAX32650"
+    */
+
+    "debugger":"cmsis-dap",/*<-- Debugger to use.  
+    Options :
+    "cmsis-dap" (for PICO)
+    "olimex-arm-usb-ocd" (for http://www.olimex.com/dev/arm-usb-ocd.html)
+    "olimex-arm-usb-ocd-h" (for http://www.olimex.com/dev/arm-usb-ocd.html)
+    "olimex-arm-usb-tiny-h" (for http://www.olimex.com/dev/arm-usb-tiny-h.html)
+    "olimex-jtag-tiny" (for http://www.olimex.com/dev/arm-usb-tiny.html)
+    "ftdi/olimex-arm-jtag-swd" (for https://www.olimex.com/Products/ARM/JTAG/ARM-JTAG-SWD/ w/ ftdi interface)
+    "ftdi/olimex-arm-usb-ocd" (for http://www.olimex.com/dev/arm-usb-ocd.html w/ ftdi interface)
+    "ftdi/olimex-arm-usb-ocd-h" (for http://www.olimex.com/dev/arm-usb-ocd-h.html w/ ftdi interface)
+    "ftdi/olimex-arm-usb-tiny-h" (for http://www.olimex.com/dev/arm-usb-tiny-h.html w/ ftdi interface)
+    "ftdi/olimex-jtag-tiny" (for http://www.olimex.com/dev/arm-usb-tiny.html w/ ftdi interface)
+    */
 
 }
diff --git a/MaximSDK/New_Project/.vscode/launch.json b/MaximSDK/New_Project/.vscode/launch.json
@@ -6,7 +6,7 @@
             "request": "launch",
             "program": "${workspaceFolder}/build/${config:target}.elf",
             "args": [],
-            "stopAtEntry": false,
+            "stopAtEntry": true,
             "cwd": "${workspaceFolder}",
             "environment": [],
             "externalConsole": false,
@@ -17,7 +17,7 @@
             "setupCommands": [
                 {
                     "description": "Launch OpenOCD from within GDB via pipe connection",
-                    "text": "target remote | openocd -c \"gdb_port pipe;log_output openocd.log\" -s ${config:MAXIM_PATH}/Tools/OpenOCD/scripts -f interface/cmsis-dap.cfg -f target/${config:target}.cfg",
+                    "text": "target remote | openocd -c \"gdb_port pipe;log_output openocd.log\" -s ${config:MAXIM_PATH}/Tools/OpenOCD/scripts -f interface/${config:debugger}.cfg -f target/${config:target}.cfg",
                     "ignoreFailures": false
                 },
                 {

diff --git a/MaximSDK/New_Project/.vscode/settings.json b/MaximSDK/New_Project/.vscode/settings.json
@@ -6,13 +6,29 @@
     "MAXIM_PATH":"C:/MaximSDK", //<-- This is the root installation directory of the Maxim Micros Toolchain.  Change this if you used a non-default installation location.
 
     "target":"MAX32655",/*<-- Change to the correct target micro.
-                            Options :
-                            MAX32520
-                            MAX32570
-                            MAX32655
-                            MAX32670
-                            MAX23675
-                            MAX78000
-                        */ 
+    Options :
+    "MAX32520"
+    "MAX32570"
+    "MAX32655"
+    "MAX32660"
+    "MAX32665" (for MAX32665-MAX32668)
+    "MAX32670"
+    "MAX32672"
+    "MAX32675"
+    "MAX78000"
+    */ 
 
+    "debugger":"cmsis-dap",/*<-- Debugger to use.  
+    Options :
+    "cmsis-dap" (for PICO)
+    "olimex-arm-usb-ocd" (for http://www.olimex.com/dev/arm-usb-ocd.html)
+    "olimex-arm-usb-ocd-h" (for http://www.olimex.com/dev/arm-usb-ocd.html)
+    "olimex-arm-usb-tiny-h" (for http://www.olimex.com/dev/arm-usb-tiny-h.html)
+    "olimex-jtag-tiny" (for http://www.olimex.com/dev/arm-usb-tiny.html)
+    "ftdi/olimex-arm-jtag-swd" (for https://www.olimex.com/Products/ARM/JTAG/ARM-JTAG-SWD/ w/ ftdi interface)
+    "ftdi/olimex-arm-usb-ocd" (for http://www.olimex.com/dev/arm-usb-ocd.html w/ ftdi interface)
+    "ftdi/olimex-arm-usb-ocd-h" (for http://www.olimex.com/dev/arm-usb-ocd-h.html w/ ftdi interface)
+    "ftdi/olimex-arm-usb-tiny-h" (for http://www.olimex.com/dev/arm-usb-tiny-h.html w/ ftdi interface)
+    "ftdi/olimex-jtag-tiny" (for http://www.olimex.com/dev/arm-usb-tiny.html w/ ftdi interface)
+    */
 }
diff --git a/MaximSDK/New_Project/Makefile b/MaximSDK/New_Project/Makefile
@@ -77,6 +77,7 @@ COMPILER=GCC
 # Specify the board used
 ifeq "$(BOARD)" ""
 BOARD=EvKit_V1
+#BOARD=FTHR_RevA
 endif
 
 # This is the path to the CMSIS root directory