Skip to content

Commit 07fb331

Browse files
committed
Merge branch 'develop'
2 parents 7553e35 + e62f3d2 commit 07fb331

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2627
-926
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build
22
buildlogs*
33
__pycache__
4-
MaximSDK/Template/.vscode/readme.md
4+
MaximSDK/Template/.vscode/README.md

MaximSDK/Inject/.vscode/c_cpp_properties.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"intelliSenseMode": "gcc-arm",
1212
"compilerPath": "${config:ARM_GCC_path}/bin/arm-none-eabi-gcc.exe",
1313
"browse": {
14-
"path": [
14+
"path": [
1515
"${default}"
1616
]
1717
}

MaximSDK/Inject/.vscode/launch.json

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
{ "text":"symbol-file build/${config:symbol_file}" },
4747
{ "text":"target remote localhost:3333" },
4848
{ "text":"monitor reset halt" },
49+
{ "text":"set $pc=Reset_Handler"},
4950
{ "text":"b main" }
5051
]
5152
},

MaximSDK/Inject/.vscode/tasks.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"label": "build",
66
"type": "shell",
7-
"command": "make -r -j 8 all TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
7+
"command": "make -r -j 8 TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
88
"group": "build",
99
"problemMatcher": []
1010
},

0 commit comments

Comments
 (0)