ProxSpace path fixes

This commit is contained in:
gator96100 2020-12-29 21:02:23 +01:00
parent a103628a35
commit 7357d17c8c
2 changed files with 7 additions and 13 deletions

13
.vscode/setup.sh vendored
View file

@ -20,8 +20,7 @@
# Uncomment to override #
###############################
#export SerialPort="COM5"
#export DebuggerPath="${workspaceFolder}/../../msys2/mingw64/bin/gdb.exe"
#export JLinkServerPath="/c/Program Files (x86)/SEGGER/JLink/JLinkGDBServerCL.exe"
#export JLinkServerPath="C:/Program Files (x86)/SEGGER/JLink/JLinkGDBServerCL.exe"
#Debugging on 256KB systems is not recommended
#This option does not override PLATFORM_SIZE
@ -59,12 +58,6 @@ function setup_gdb_linux {
fi
}
function setup_gdb_ps {
if [ -z "$DebuggerPath" ]; then
export DebuggerPath="${workspaceFolder}/../../msys2/mingw64/bin/gdb.exe"
fi
}
function setup_jlink_linux {
if [ -z "$JLinkServerPath" ]; then
export JLinkServerPath="/opt/SEGGER/JLink/JLinkGDBServerCLExe"
@ -88,9 +81,9 @@ function setup_jlink_wsl {
function setup_jlink_ps {
if [ -z "$JLinkServerPath" ]; then
export JLinkServerPath="/c/Program Files (x86)/SEGGER/JLink/JLinkGDBServerCL.exe"
export JLinkServerPath="c:/Program Files (x86)/SEGGER/JLink/JLinkGDBServerCL.exe"
fi
if [ ! -x "$JLinkServerPath" ]; then
if [ ! -x $(cygpath \"$JLinkServerPath\") ]; then
echo >&2 "[!!] JLinkGDBServerCL.exe not found, please set JLinkServerPath manually"
exit 1
fi

View file

@ -15,6 +15,7 @@
"name": "Client: (gdb) Build & Launch",
"type": "cppdbg",
"request": "launch",
"cwd": "${workspaceFolder}",
"program": "${cwd}/client/proxmark3",
"args": ["${SerialPort}"],
"stopAtEntry": false,
@ -28,13 +29,13 @@
}
],
"preLaunchTask": "client: Debug: clean & make",
"miDebuggerPath": "${DebuggerPath}"
"miDebuggerPath": "${workspaceFolder}/../../msys2/mingw64/bin/gdb.exe"
},{
"name": "Firmware: (J-Link) Build & Launch",
"type": "cortex-debug",
"request": "launch",
"cwd": "${workspaceRoot}",
"preLaunchTask": "fullimage: clean & make",
"preLaunchTask": "fullimage: clean & make debug",
"executable": "${workspaceRoot}/armsrc/obj/fullimage.elf",
"serverpath": "${JLinkServerPath}",
"servertype": "jlink",
@ -42,7 +43,7 @@
"interface": "jtag",
"serialNumber": "", //If you have more than one J-Link probe, add the serial number here.
"runToMain": false,
"armToolchainPath": "/usr/bin/"
"armToolchainPath": "${workspaceFolder}/../../msys2/mingw64/bin"
}
]
}