Skip to content

Commit 2483255

Browse files
committed
Enable semihosting for pyOCD for 'launch' configs if telnet mode other off is set
Signed-off-by: Jens Reinecke <jens.reinecke@arm.com>
1 parent 3849a08 commit 2483255

2 files changed

Lines changed: 22 additions & 2 deletions

File tree

templates/CMSIS-DAP-pyOCD.adapter.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
}
1717
},
1818
"program": "<%= symbol_files[0]?.file ?? '' %>",
19-
"programs": "<%= symbol_files.flatMap(e => (e.pname || !processors?.length) ? e : processors.map(p => ({ ...e, pname: p }))).groupedBy(v => v.pname ?? '') %>"
19+
"programs": "<%= symbol_files.flatMap(e => (e.pname || !processors?.length) ? e : processors.map(p => ({ ...e, pname: p }))).groupedBy(v => v.pname ?? '') %>",
20+
"telnetOptionsInput": "<%= config.telnet && Array.isArray(config.telnet) ? Object.fromEntries(config.telnet.map(t => ( [ t.pname ?? '', { mode: t.mode }]))) : undefined %>",
21+
"telnetOptionsDefault": "<%= { mode: config.telnet?.mode ?? 'off' } %>"
2022
},
2123
"launch": {
2224
"singlecore-launch": {
@@ -50,6 +52,10 @@
5052
"<% } %>",
5153
"--connect", "attach",
5254
"--cbuild-run", "${command:cmsis-csolution.getCbuildRunFile}",
55+
"<% const telnetMode = data.telnetOptionsInput[pname ?? '']?.mode ?? data.telnetOptionsDefault.mode %>",
56+
"<% if (telnetMode && telnetMode !== 'off') { %>",
57+
"-S",
58+
"<% } %>",
5359
"--quiet",
5460
"--log", "*.cbuild_run,*server=info"
5561
],
@@ -118,6 +124,10 @@
118124
"--connect", "attach",
119125
"--persist",
120126
"--cbuild-run", "${command:cmsis-csolution.getCbuildRunFile}",
127+
"<% const telnetMode = data.telnetOptionsInput[pname ?? '']?.mode ?? data.telnetOptionsDefault.mode %>",
128+
"<% if (telnetMode && telnetMode !== 'off') { %>",
129+
"-S",
130+
"<% } %>",
121131
"--quiet",
122132
"--log", "*.cbuild_run,*server=info"
123133
],

templates/STLink-pyOCD.adapter.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
}
1717
},
1818
"program": "<%= symbol_files[0]?.file ?? '' %>",
19-
"programs": "<%= symbol_files.flatMap(e => (e.pname || !processors?.length) ? e : processors.map(p => ({ ...e, pname: p }))).groupedBy(v => v.pname ?? '') %>"
19+
"programs": "<%= symbol_files.flatMap(e => (e.pname || !processors?.length) ? e : processors.map(p => ({ ...e, pname: p }))).groupedBy(v => v.pname ?? '') %>",
20+
"telnetOptionsInput": "<%= config.telnet && Array.isArray(config.telnet) ? Object.fromEntries(config.telnet.map(t => ( [ t.pname ?? '', { mode: t.mode }]))) : undefined %>",
21+
"telnetOptionsDefault": "<%= { mode: config.telnet?.mode ?? 'off' } %>"
2022
},
2123
"launch": {
2224
"singlecore-launch": {
@@ -50,6 +52,10 @@
5052
"<% } %>",
5153
"--connect", "attach",
5254
"--cbuild-run", "${command:cmsis-csolution.getCbuildRunFile}",
55+
"<% const telnetMode = data.telnetOptionsInput[pname ?? '']?.mode ?? data.telnetOptionsDefault.mode %>",
56+
"<% if (telnetMode && telnetMode !== 'off') { %>",
57+
"-S",
58+
"<% } %>",
5359
"--quiet",
5460
"--log", "*.cbuild_run,*server=info"
5561
],
@@ -118,6 +124,10 @@
118124
"--connect", "attach",
119125
"--persist",
120126
"--cbuild-run", "${command:cmsis-csolution.getCbuildRunFile}",
127+
"<% const telnetMode = data.telnetOptionsInput[pname ?? '']?.mode ?? data.telnetOptionsDefault.mode %>",
128+
"<% if (telnetMode && telnetMode !== 'off') { %>",
129+
"-S",
130+
"<% } %>",
121131
"--quiet",
122132
"--log", "*.cbuild_run,*server=info"
123133
],

0 commit comments

Comments
 (0)