Merge pull request #9 from MaximIntegratedTechSupport/develop

Merge v1.4.2 Develop
analogdevicesinc · May 16, 2022 · ad624c3 · ad624c3
2 parents bb61fc0 + 2402965
commit ad624c3
Show file tree

Hide file tree

Showing 16 changed files with 332 additions and 168 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+build
+buildlogs*
+__pycache__
diff --git a/MaximSDK/Inject/.vscode/launch.json b/MaximSDK/Inject/.vscode/launch.json
@@ -55,21 +55,21 @@
             "request": "launch",
             "program": "${workspaceFolder}/buildrv/${config:program_file}",
             "args": [],
-            "stopAtEntry": true,
+            "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": [],
             "externalConsole": false,
             "MIMode": "gdb",
             "linux": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb",
                 "debugServerPath": "${config:OCD_path}/openocd",
             },
             "windows": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb.exe",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb.exe",
                 "debugServerPath": "${config:OCD_path}/openocd.exe",
             },
             "osx": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb",
                 "debugServerPath": "${config:OCD_path}/bin/openocd",
             },
             "logging": {
@@ -95,6 +95,7 @@
                 { "text":"exec-file build/${config:program_file}", "ignoreFailures": false },
                 { "text":"symbol-file buildrv/${config:symbol_file}", "ignoreFailures": false },
                 { "text":"target remote localhost:3334" },
+                { "text":"b main" },
                 { "text": "set $pc=Reset_Handler","ignoreFailures": false }
             ]
         }

diff --git a/MaximSDK/New_Project/.vscode/launch.json b/MaximSDK/New_Project/.vscode/launch.json
@@ -55,21 +55,21 @@
             "request": "launch",
             "program": "${workspaceFolder}/buildrv/${config:program_file}",
             "args": [],
-            "stopAtEntry": true,
+            "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": [],
             "externalConsole": false,
             "MIMode": "gdb",
             "linux": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb",
                 "debugServerPath": "${config:OCD_path}/openocd",
             },
             "windows": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb.exe",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb.exe",
                 "debugServerPath": "${config:OCD_path}/openocd.exe",
             },
             "osx": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb",
                 "debugServerPath": "${config:OCD_path}/bin/openocd",
             },
             "logging": {
@@ -95,6 +95,7 @@
                 { "text":"exec-file build/${config:program_file}", "ignoreFailures": false },
                 { "text":"symbol-file buildrv/${config:symbol_file}", "ignoreFailures": false },
                 { "text":"target remote localhost:3334" },
+                { "text":"b main" },
                 { "text": "set $pc=Reset_Handler","ignoreFailures": false }
             ]
         }

diff --git a/MaximSDK/Template/.vscode/launch.json b/MaximSDK/Template/.vscode/launch.json
@@ -55,21 +55,21 @@
             "request": "launch",
             "program": "${workspaceFolder}/buildrv/${config:program_file}",
             "args": [],
-            "stopAtEntry": true,
+            "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": [],
             "externalConsole": false,
             "MIMode": "gdb",
             "linux": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb",
                 "debugServerPath": "${config:OCD_path}/openocd",
             },
             "windows": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb.exe",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb.exe",
                 "debugServerPath": "${config:OCD_path}/openocd.exe",
             },
             "osx": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb",
                 "debugServerPath": "${config:OCD_path}/bin/openocd",
             },
             "logging": {
@@ -95,6 +95,7 @@
                 { "text":"exec-file build/${config:program_file}", "ignoreFailures": false },
                 { "text":"symbol-file buildrv/${config:symbol_file}", "ignoreFailures": false },
                 { "text":"target remote localhost:3334" },
+                { "text":"b main" },
                 { "text": "set $pc=Reset_Handler","ignoreFailures": false }
             ]
         }

diff --git a/MaximSDK/Template/.vscode/templatesettings.json b/MaximSDK/Template/.vscode/templatesettings.json
@@ -3,6 +3,8 @@
         "Path":"${config:OCD_path};${config:ARM_GCC_path}/bin;${config:xPack_GCC_path}/bin;${config:Make_path};${env:PATH}",
         "MAXIM_PATH":"${config:MAXIM_PATH}"
     },
+    "terminal.integrated.defaultProfile.windows": "Command Prompt",
+
     "terminal.integrated.env.linux": {
         "PATH":"${config:OCD_path}:${config:ARM_GCC_path}/bin:${config:xPack_GCC_path}/bin:${env:PATH}",
         "MAXIM_PATH":"${config:MAXIM_PATH}"

diff --git a/...r/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/.vscode/launch.json b/...r/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/.vscode/launch.json
@@ -55,21 +55,21 @@
             "request": "launch",
             "program": "${workspaceFolder}/buildrv/${config:program_file}",
             "args": [],
-            "stopAtEntry": true,
+            "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": [],
             "externalConsole": false,
             "MIMode": "gdb",
             "linux": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb",
                 "debugServerPath": "${config:OCD_path}/openocd",
             },
             "windows": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb.exe",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb.exe",
                 "debugServerPath": "${config:OCD_path}/openocd.exe",
             },
             "osx": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb",
                 "debugServerPath": "${config:OCD_path}/bin/openocd",
             },
             "logging": {
@@ -95,6 +95,7 @@
                 { "text":"exec-file build/${config:program_file}", "ignoreFailures": false },
                 { "text":"symbol-file buildrv/${config:symbol_file}", "ignoreFailures": false },
                 { "text":"target remote localhost:3334" },
+                { "text":"b main" },
                 { "text": "set $pc=Reset_Handler","ignoreFailures": false }
             ]
         }

diff --git a/...com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/.vscode/settings.json b/...com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/.vscode/settings.json
@@ -3,6 +3,8 @@
         "Path":"${config:OCD_path};${config:ARM_GCC_path}/bin;${config:xPack_GCC_path}/bin;${config:Make_path};${env:PATH}",
         "MAXIM_PATH":"${config:MAXIM_PATH}"
     },
+    "terminal.integrated.defaultProfile.windows": "Command Prompt",
+
     "terminal.integrated.env.linux": {
         "PATH":"${config:OCD_path}:${config:ARM_GCC_path}/bin:${config:xPack_GCC_path}/bin:${env:PATH}",
         "MAXIM_PATH":"${config:MAXIM_PATH}"

diff --git a/...er/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/.vscode/tasks.json b/...er/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/.vscode/tasks.json
@@ -27,7 +27,7 @@
             "type": "shell",
             "command": "arm-none-eabi-gdb",
             "args": [                
-                "--ex=\"cd ${workspaceFolder}\"",
+                "--cd=\"${workspaceFolder}\"",
                 "--se=\"build/${config:program_file}\"",
                 "--symbols=build/${config:symbol_file}",
                 "-x=\"${workspaceFolder}/.vscode/flash.gdb\"",                

diff --git a/....maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/.vscode/launch.json b/....maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/.vscode/launch.json
@@ -55,21 +55,21 @@
             "request": "launch",
             "program": "${workspaceFolder}/buildrv/${config:program_file}",
             "args": [],
-            "stopAtEntry": true,
+            "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": [],
             "externalConsole": false,
             "MIMode": "gdb",
             "linux": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb",
                 "debugServerPath": "${config:OCD_path}/openocd",
             },
             "windows": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb.exe",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb.exe",
                 "debugServerPath": "${config:OCD_path}/openocd.exe",
             },
             "osx": {
-                "miDebuggerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gdb",
+                "miDebuggerPath": "${config:xPack_GCC_path}/bin/riscv-none-embed-gdb",
                 "debugServerPath": "${config:OCD_path}/bin/openocd",
             },
             "logging": {
@@ -95,6 +95,7 @@
                 { "text":"exec-file build/${config:program_file}", "ignoreFailures": false },
                 { "text":"symbol-file buildrv/${config:symbol_file}", "ignoreFailures": false },
                 { "text":"target remote localhost:3334" },
+                { "text":"b main" },
                 { "text": "set $pc=Reset_Handler","ignoreFailures": false }
             ]
         }

diff --git a/...aximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/.vscode/settings.json b/...aximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/.vscode/settings.json
@@ -3,6 +3,8 @@
         "Path":"${config:OCD_path};${config:ARM_GCC_path}/bin;${config:xPack_GCC_path}/bin;${config:Make_path};${env:PATH}",
         "MAXIM_PATH":"${config:MAXIM_PATH}"
     },
+    "terminal.integrated.defaultProfile.windows": "Command Prompt",
+
     "terminal.integrated.env.linux": {
         "PATH":"${config:OCD_path}:${config:ARM_GCC_path}/bin:${config:xPack_GCC_path}/bin:${env:PATH}",
         "MAXIM_PATH":"${config:MAXIM_PATH}"

diff --git a/...m.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/.vscode/tasks.json b/...m.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/.vscode/tasks.json
@@ -27,7 +27,7 @@
             "type": "shell",
             "command": "arm-none-eabi-gdb",
             "args": [                
-                "--ex=\"cd ${workspaceFolder}\"",
+                "--cd=\"${workspaceFolder}\"",
                 "--se=\"build/${config:program_file}\"",
                 "--symbols=build/${config:symbol_file}",
                 "-x=\"${workspaceFolder}/.vscode/flash.gdb\"",