Merge branch 'develop'

analogdevicesinc · Nov 21, 2022 · 07fb331 · 07fb331
2 parents 7553e35 + e62f3d2
commit 07fb331
Show file tree

Hide file tree

Showing 52 changed files with 2,627 additions and 926 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 build
 buildlogs*
 __pycache__
-MaximSDK/Template/.vscode/readme.md
+MaximSDK/Template/.vscode/README.md
diff --git a/MaximSDK/Inject/.vscode/c_cpp_properties.json b/MaximSDK/Inject/.vscode/c_cpp_properties.json
@@ -11,7 +11,7 @@
             "intelliSenseMode": "gcc-arm",
             "compilerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gcc.exe",
             "browse": {
-                "path": [                    
+                "path": [
                     "${default}"
                 ]
             }

diff --git a/MaximSDK/Inject/.vscode/launch.json b/MaximSDK/Inject/.vscode/launch.json
@@ -46,6 +46,7 @@
                 { "text":"symbol-file build/${config:symbol_file}" },
                 { "text":"target remote localhost:3333" },
                 { "text":"monitor reset halt" },
+                { "text":"set $pc=Reset_Handler"},
                 { "text":"b main" }
             ]
         },

diff --git a/MaximSDK/Inject/.vscode/tasks.json b/MaximSDK/Inject/.vscode/tasks.json
@@ -4,7 +4,7 @@
         {
             "label": "build",
             "type": "shell",
-            "command": "make -r -j 8 all TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
+            "command": "make -r -j 8 TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
             "group": "build",
             "problemMatcher": []
         },