Skip to content

Commit 20b23eb

Browse files
author
pyocd-bot
committed
Deploying to main from @ pyocd/pyocd-website-source@689148c 🚀
1 parent fd7e090 commit 20b23eb

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

docs/api/using_session_options.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ <h2 id="priority-layers">Priority layers</h2>
262262
<ol>
263263
<li>Keyword arguments to the <code class="highlighter-rouge">Session</code> constructor. Applies to most dedicated command-line arguments.</li>
264264
<li><em>options</em> parameter to <code class="highlighter-rouge">Session</code> constructor. Applies to <code class="highlighter-rouge">-O</code> command-line arguments.</li>
265+
<li>Options set by CMSIS-Toolbox Run and Debug Management (<code class="highlighter-rouge">cbuild-run</code>)</li>
265266
<li>Probe-specific options from a config file.</li>
266267
<li>Global options from a config file.</li>
267268
<li><em>option_defaults</em> parameter to <code class="highlighter-rouge">Session</code> constructor. Used only in rare cases by subcommands to change the default value of options.</li>
@@ -307,7 +308,6 @@ <h2 id="adding-new-options">Adding new options</h2>
307308
<p>Supported types for options are <em>bool</em>, <em>int</em>, <em>float</em>, and <em>str</em>. An option that allows multiple types is specified with a tuple of those types. The <code class="highlighter-rouge">convert_session_options()</code> function from <code class="highlighter-rouge">pyocd.utility.cmdline</code> will convert the <em>bool</em>, <em>int</em>, and <em>float</em> options from a string value. However, there is not automatic type conversion when setting options directly on the <code class="highlighter-rouge">OptionsManager</code>.</p>
308309

309310

310-
311311
</div>
312312
</div>
313313
</main>

docs/options.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,22 @@ <h2 id="general-options">General options</h2>
469469
with new data.
470470
</td></tr>
471471

472+
<tr><td>load.pre_reset</td>
473+
<td>str</td>
474+
<td><i>No default</i></td>
475+
<td>
476+
Specify the type of reset to perform before programming. The value must be one of
477+
'off', 'default', 'hardware', 'system', 'core', 'n_srst', 'sysresetreq', 'vectreset' or 'emulated'.
478+
</td></tr>
479+
480+
<tr><td>load.post_reset</td>
481+
<td>str</td>
482+
<td><i>No default</i></td>
483+
<td>
484+
Specify the type of reset to perform after programming. The value must be one of
485+
'off', 'default', 'hardware', 'system', 'core', 'n_srst', 'sysresetreq', 'vectreset' or 'emulated'.
486+
</td></tr>
487+
472488
<tr><td>logging</td>
473489
<td>str, dict</td>
474490
<td><i>No default</i></td>

0 commit comments

Comments
 (0)