Skip to content

Commit

Permalink
Merge pull request #8 from MaximIntegratedTechSupport/develop
Browse files Browse the repository at this point in the history 
Merge v1.4.0 Develop
  • Loading branch information
@Jake-Carter
Jake-Carter authored Apr 11, 2022
2 parents 4522139 + 4d5ea43 commit 39f9265
Show file tree
Hide file tree
Showing 20 changed files with 185 additions and 43 deletions.
6 changes: 6 additions & 0 deletions MaximSDK/Inject/.vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
{"text":"-list-features"}
],
"setupCommands": [
{ "text":"set logging overwrite on"},
{ "text":"set logging file debug-arm.log"},
{ "text":"set logging on"},
{ "text":"cd ${workspaceFolder}" },
{ "text":"exec-file build/${config:program_file}" },
{ "text":"symbol-file build/${config:symbol_file}" },
Expand Down Expand Up @@ -84,6 +87,9 @@
],
"targetArchitecture": "arm",
"setupCommands": [
{ "text":"set logging overwrite on"},
{ "text":"set logging file debug-riscv.log"},
{ "text":"set logging on"},
{ "text":"cd ${workspaceFolder}" },
{ "text": "set architecture riscv:rv32", "ignoreFailures": false },
{ "text":"exec-file build/${config:program_file}", "ignoreFailures": false },
Expand Down
18 changes: 16 additions & 2 deletions MaximSDK/Inject/.vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,27 @@
"${config:MAXIM_PATH}/Libraries/CMSIS/Include",
"${config:ARM_GCC_path}/arm-none-eabi/include",
"${config:ARM_GCC_path}/lib/gcc/arm-none-eabi/${config:v_Arm_GCC}/include",
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Include/${config:target}"
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Include/${config:target}",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Camera",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Display",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/ExtMemory",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/LED",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PMIC",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PushButton",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Touchscreen"
],
"C_Cpp.default.browse.path": [
"${workspaceFolder}",
"${config:MAXIM_PATH}/Libraries/Boards/${config:target}/Source",
"${config:MAXIM_PATH}/Libraries/Boards/${config:target}/${config:board}/Source",
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Source"
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Source",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Camera",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Display",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/LED",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PMIC",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PushButton",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Touchscreen",
"${config:MAXIM_PATH}/Libraries/MiscDrivers"
],
"C_Cpp.default.defines": [
"${config:board}"
Expand Down
2 changes: 1 addition & 1 deletion MaximSDK/Inject/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"label": "build",
"type": "shell",
"command": "make -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 all TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
"group": "build",
"problemMatcher": []
},
Expand Down
6 changes: 6 additions & 0 deletions MaximSDK/New_Project/.vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
{"text":"-list-features"}
],
"setupCommands": [
{ "text":"set logging overwrite on"},
{ "text":"set logging file debug-arm.log"},
{ "text":"set logging on"},
{ "text":"cd ${workspaceFolder}" },
{ "text":"exec-file build/${config:program_file}" },
{ "text":"symbol-file build/${config:symbol_file}" },
Expand Down Expand Up @@ -84,6 +87,9 @@
],
"targetArchitecture": "arm",
"setupCommands": [
{ "text":"set logging overwrite on"},
{ "text":"set logging file debug-riscv.log"},
{ "text":"set logging on"},
{ "text":"cd ${workspaceFolder}" },
{ "text": "set architecture riscv:rv32", "ignoreFailures": false },
{ "text":"exec-file build/${config:program_file}", "ignoreFailures": false },
Expand Down
18 changes: 16 additions & 2 deletions MaximSDK/New_Project/.vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,27 @@
"${config:MAXIM_PATH}/Libraries/CMSIS/Include",
"${config:ARM_GCC_path}/arm-none-eabi/include",
"${config:ARM_GCC_path}/lib/gcc/arm-none-eabi/${config:v_Arm_GCC}/include",
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Include/${config:target}"
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Include/${config:target}",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Camera",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Display",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/ExtMemory",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/LED",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PMIC",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PushButton",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Touchscreen"
],
"C_Cpp.default.browse.path": [
"${workspaceFolder}",
"${config:MAXIM_PATH}/Libraries/Boards/${config:target}/Source",
"${config:MAXIM_PATH}/Libraries/Boards/${config:target}/${config:board}/Source",
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Source"
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Source",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Camera",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Display",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/LED",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PMIC",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PushButton",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Touchscreen",
"${config:MAXIM_PATH}/Libraries/MiscDrivers"
],
"C_Cpp.default.defines": [
"${config:board}"
Expand Down
2 changes: 1 addition & 1 deletion MaximSDK/New_Project/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"label": "build",
"type": "shell",
"command": "make -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 all TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
"group": "build",
"problemMatcher": []
},
Expand Down
6 changes: 6 additions & 0 deletions MaximSDK/Template/.vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
{"text":"-list-features"}
],
"setupCommands": [
{ "text":"set logging overwrite on"},
{ "text":"set logging file debug-arm.log"},
{ "text":"set logging on"},
{ "text":"cd ${workspaceFolder}" },
{ "text":"exec-file build/${config:program_file}" },
{ "text":"symbol-file build/${config:symbol_file}" },
Expand Down Expand Up @@ -84,6 +87,9 @@
],
"targetArchitecture": "arm",
"setupCommands": [
{ "text":"set logging overwrite on"},
{ "text":"set logging file debug-riscv.log"},
{ "text":"set logging on"},
{ "text":"cd ${workspaceFolder}" },
{ "text": "set architecture riscv:rv32", "ignoreFailures": false },
{ "text":"exec-file build/${config:program_file}", "ignoreFailures": false },
Expand Down
2 changes: 1 addition & 1 deletion MaximSDK/Template/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"label": "build",
"type": "shell",
"command": "make -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 all TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
"group": "build",
"problemMatcher": []
},
Expand Down
Binary file modified img/installer_components.JPG
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions ...r/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/.vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
{"text":"-list-features"}
],
"setupCommands": [
{ "text":"set logging overwrite on"},
{ "text":"set logging file debug-arm.log"},
{ "text":"set logging on"},
{ "text":"cd ${workspaceFolder}" },
{ "text":"exec-file build/${config:program_file}" },
{ "text":"symbol-file build/${config:symbol_file}" },
Expand Down Expand Up @@ -84,6 +87,9 @@
],
"targetArchitecture": "arm",
"setupCommands": [
{ "text":"set logging overwrite on"},
{ "text":"set logging file debug-riscv.log"},
{ "text":"set logging on"},
{ "text":"cd ${workspaceFolder}" },
{ "text": "set architecture riscv:rv32", "ignoreFailures": false },
{ "text":"exec-file build/${config:program_file}", "ignoreFailures": false },
Expand Down
18 changes: 16 additions & 2 deletions ...com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/.vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,27 @@
"${config:MAXIM_PATH}/Libraries/CMSIS/Include",
"${config:ARM_GCC_path}/arm-none-eabi/include",
"${config:ARM_GCC_path}/lib/gcc/arm-none-eabi/${config:v_Arm_GCC}/include",
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Include/${config:target}"
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Include/${config:target}",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Camera",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Display",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/ExtMemory",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/LED",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PMIC",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PushButton",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Touchscreen"
],
"C_Cpp.default.browse.path": [
"${workspaceFolder}",
"${config:MAXIM_PATH}/Libraries/Boards/${config:target}/Source",
"${config:MAXIM_PATH}/Libraries/Boards/${config:target}/${config:board}/Source",
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Source"
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Source",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Camera",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Display",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/LED",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PMIC",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PushButton",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Touchscreen",
"${config:MAXIM_PATH}/Libraries/MiscDrivers"
],
"C_Cpp.default.defines": [
"${config:board}"
Expand Down
2 changes: 1 addition & 1 deletion ...er/com.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/Inject/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"label": "build",
"type": "shell",
"command": "make -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 all TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
"group": "build",
"problemMatcher": []
},
Expand Down
6 changes: 6 additions & 0 deletions ....maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/.vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
{"text":"-list-features"}
],
"setupCommands": [
{ "text":"set logging overwrite on"},
{ "text":"set logging file debug-arm.log"},
{ "text":"set logging on"},
{ "text":"cd ${workspaceFolder}" },
{ "text":"exec-file build/${config:program_file}" },
{ "text":"symbol-file build/${config:symbol_file}" },
Expand Down Expand Up @@ -84,6 +87,9 @@
],
"targetArchitecture": "arm",
"setupCommands": [
{ "text":"set logging overwrite on"},
{ "text":"set logging file debug-riscv.log"},
{ "text":"set logging on"},
{ "text":"cd ${workspaceFolder}" },
{ "text": "set architecture riscv:rv32", "ignoreFailures": false },
{ "text":"exec-file build/${config:program_file}", "ignoreFailures": false },
Expand Down
18 changes: 16 additions & 2 deletions ...aximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/.vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,27 @@
"${config:MAXIM_PATH}/Libraries/CMSIS/Include",
"${config:ARM_GCC_path}/arm-none-eabi/include",
"${config:ARM_GCC_path}/lib/gcc/arm-none-eabi/${config:v_Arm_GCC}/include",
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Include/${config:target}"
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Include/${config:target}",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Camera",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Display",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/ExtMemory",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/LED",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PMIC",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PushButton",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Touchscreen"
],
"C_Cpp.default.browse.path": [
"${workspaceFolder}",
"${config:MAXIM_PATH}/Libraries/Boards/${config:target}/Source",
"${config:MAXIM_PATH}/Libraries/Boards/${config:target}/${config:board}/Source",
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Source"
"${config:MAXIM_PATH}/Libraries/PeriphDrivers/Source",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Camera",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Display",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/LED",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PMIC",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/PushButton",
"${config:MAXIM_PATH}/Libraries/MiscDrivers/Touchscreen",
"${config:MAXIM_PATH}/Libraries/MiscDrivers"
],
"C_Cpp.default.defines": [
"${config:board}"
Expand Down
2 changes: 1 addition & 1 deletion ...m.maximintegrated.dist.vscodemaxim/data/Tools/VSCode-Maxim/New_Project/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"label": "build",
"type": "shell",
"command": "make -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 all TARGET=${config:target} BOARD=${config:board} MAXIM_PATH=${config:MAXIM_PATH} MAKE=make PROJECT=${config:project_name}",
"group": "build",
"problemMatcher": []
},
Expand Down
Loading

0 comments on commit 39f9265

Please sign in to comment.