Skip to content

Commit 1d1734d

Browse files
committed
Add a debugger selection options, some GUI rearrangement. Update readme
1 parent 356e451 commit 1d1734d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

pico_project.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,11 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger):
982982
' "type": "cortex-debug",\n'
983983
' "servertype": "openocd",\n'
984984
' "gdbPath": "gdb-multiarch",\n'
985+
<<<<<<< HEAD
985986
' "device": "RP2040",\n'
987+
=======
988+
' "device": "Pico2040",\n'
989+
>>>>>>> Add a debugger selection options, some GUI rearrangement. Update readme
986990
' "configFiles": [\n' + \
987991
' "interface/' + deb + '",\n' + \
988992
' "target/rp2040.cfg"\n' + \

0 commit comments

Comments
 (0)