Deploying to main from @ pyocd/pyocd-website-source@570db5b 🚀

Author: pyocd-bot

docs/command_reference.html

@@ -1245,7 +1245,7 @@ <h3 id="device">Device</h3>
 <h5 id="reset"><code class="highlighter-rouge">reset</code></h5>
 
 <p><strong>Usage</strong>: reset [halt|-halt|-h] [TYPE] <br />
-Reset the target, optionally with halt and/or specifying the reset type. The reset type must be one of ‘default’, ‘hw’, ‘sw’, ‘hardware’, ‘software’, ‘system’, ‘core’, ‘emulated’, ‘sw_system’, ‘sw_core’, ‘sw_sysresetreq’, ‘sw_vectreset’, ‘sw_emulated’, ‘sysresetreq’, or ‘vectreset’.</p>
+Reset the target, optionally with halt and/or specifying the reset type. The reset type must be one of ‘default’, ‘hardware’, ‘system’, ‘core’, ‘n_srst’, ‘sysresetreq’, ‘vectreset’ or ‘emulated’.</p>
 
 <h5 id="unlock"><code class="highlighter-rouge">unlock</code></h5>
 

docs/multicore_debug.html

@@ -239,7 +239,7 @@ <h5 class="sidebar-header">On this page</h5>
 
 <p>By default, the primary core is core number 0. For Arm CoreSight based devices, this will be the core with the lowest associated access port address. Use the <code class="highlighter-rouge">primary_core</code> session option to change the primary core.</p>
 
-<p>When performing multicore debug where multiple gdb instances are connected simultaneously, it is important to set the <code class="highlighter-rouge">enable_multicore_debug</code> session option to true. This changes secondary cores to have their default reset type set to core-only reset (<code class="highlighter-rouge">sw_core</code>). This prevents competing reset requests from the multiple gdb instances causing havoc. On v7-M architecture cores, VECTRESET is used. However, VECTRESET is not supported on other core architecture, so non-v7-M architectures will fall back to an emulated core reset.</p>
+<p>When performing multicore debug where multiple gdb instances are connected simultaneously, it is important to set the <code class="highlighter-rouge">enable_multicore_debug</code> session option to true. This changes secondary cores to have their default reset type set to core-only reset. This prevents competing reset requests from the multiple gdb instances causing havoc.</p>
 
 <p>To debug a multicore device, run <code class="highlighter-rouge">pyocd gdbserver</code> as usual. This will connect to the device, detect
 the cores, and create the gdb server instances on separate ports. Next, start up two gdb instances
@@ -257,7 +257,6 @@ <h5 class="sidebar-header">On this page</h5>
 depend on whether the secondary core’s code is running out of flash or RAM.</p>
 
 
-
                 </div>
               </div>
             </main>

docs/options.html

@@ -551,13 +551,12 @@ <h2 id="general-options">General options</h2>
 
 <tr><td>reset_type</td>
 <td>str</td>
-<td>'sw'</td>
+<td>'default'</td>
 <td>
-Which type of reset to use by default. Must be one of `default`, `hw`, `sw`, `sw_system`, `sw_core`,
-`sw_sysresetreq`, `sw_vectreset`, `sw_emulated`, `system`, `core`, `sysresetreq`, `vectreset`,
-`emulated`). The default is `sw`, which itself defaults to `sw_system`. `default` causes the target type's
-default reset type to be used; this is usually `sw`. If `enable_multicore_debug` is
-set to true, then `sw` for secondary cores will default to `sw_core`.
+Which type of reset to use. Must be one of 'default', 'hardware', 'system', 'core', 'n_srst',
+'sysresetreq', 'vectreset' or 'emulated'. The 'default' option causes the target type's
+default reset type to be used; this is usually `system`. If `enable_multicore_debug` is
+set to true, then secondary cores will default to `core`.
 </td></tr>
 
 <tr><td>reset.hold_time</td>
@@ -824,11 +823,11 @@ <h2 id="gdb-server-options">GDB server options</h2>
 - <tt>n</tt>=none
 </td></tr>
 
-<tr><td>xpsr_control_fields</td>
+<tr><td>register_fields</td>
 <td>bool</td>
-<td>False</td>
+<td>True</td>
 <td>
-When set to True, XPSR and CONTROL registers will have their respective bitfields defined for
+When set to True, registers with bitfields will have their respective bitfields defined for
 presentation in gdb.
 </td></tr>
 

docs/python_api.html

@@ -330,19 +330,26 @@ <h2 id="reset-control">Reset control</h2>
 <p>The <code class="highlighter-rouge">reset_type</code> parameter on the <code class="highlighter-rouge">Target</code> reset methods can be set to one of the <code class="highlighter-rouge">Target.ResetType</code>
 enums:</p>
 <ul>
-  <li><code class="highlighter-rouge">ResetType.HW</code>: Hardware reset using the nRESET signal.</li>
-  <li><code class="highlighter-rouge">ResetType.SW</code>: Uses the core’s default software reset method.</li>
-  <li><code class="highlighter-rouge">ResetType.SW_SYSRESETREQ</code>: Software reset using SYSRESETREQ, which usually resets the entire system
+  <li><code class="highlighter-rouge">ResetType.DEFAULT</code>: Uses the core’s default reset method. For pack targets <code class="highlighter-rouge">defaultResetSequence</code> is used.
+For internal targets, the default is mapped to <code class="highlighter-rouge">ResetType.SYSTEM</code>, unless <code class="highlighter-rouge">default_reset_type</code>
+property is explicitly set.</li>
+  <li><code class="highlighter-rouge">ResetType.HARDWARE</code>: Execute <code class="highlighter-rouge">ResetHardware</code> debug sequence for pack targets, if the sequence doesn’t exist,
+hardware reset using the nSRST signal is used. The same mapping applies for internal targets.</li>
+  <li><code class="highlighter-rouge">ResetType.SYSTEM</code>: Execute <code class="highlighter-rouge">ResetSystem</code> debug sequence for pack targets, if the sequence doesn’t exist,
+software reset using SYSRESETREQ is used. The same mapping applies for internal targets.</li>
+  <li><code class="highlighter-rouge">ResetType.CORE</code>: Execute <code class="highlighter-rouge">ResetProcessor</code> debug sequence for pack targets, if the sequence doesn’t exist,
+software reset using VECTRESET is used. The same mapping applies for internal targets.</li>
+  <li><code class="highlighter-rouge">ResetType.NSRST</code>: Hardware reset using the nSRST signal.</li>
+  <li><code class="highlighter-rouge">ResetType.SYSRESETREQ</code>: Software reset using SYSRESETREQ, which usually resets the entire system
 on most MCUs.</li>
-  <li><code class="highlighter-rouge">ResetType.SW_VECTRESET</code>: Software reset using VECTRESET, only available on v7-M targets. This
-resets only the core itself. If requested on non-v7-M targets, it will fall back to <code class="highlighter-rouge">SW_EMULATED</code>.</li>
-  <li><code class="highlighter-rouge">ResetType.SW_EMULATED</code>: Restores the core to reset conditions by writing registers. However, this
+  <li><code class="highlighter-rouge">ResetType.VECTRESET</code>: Software reset using VECTRESET, only available on v7-M targets. This
+resets only the core itself. If requested on non-v7-M targets, it will fall back to <code class="highlighter-rouge">ResetType.EMULATED</code>.</li>
+  <li><code class="highlighter-rouge">ResetType.EMULATED</code>: Restores the core to reset conditions by writing registers. However, this
 will not trigger a reset vector catch.</li>
 </ul>
 
-<p>The <code class="highlighter-rouge">CortexM</code> objects have <code class="highlighter-rouge">default_reset_type</code> and <code class="highlighter-rouge">default_software_reset_type</code> properties that
-let you control the overall default reset type (any one of the <code class="highlighter-rouge">ResetType</code> enums), as well as the
-default if <code class="highlighter-rouge">ResetType.SW</code> is selected, respectively.</p>
+<p>The <code class="highlighter-rouge">CortexM</code> objects have a <code class="highlighter-rouge">default_reset_type</code> property that lets you control the overall default reset type.
+Property value can be any one of the <code class="highlighter-rouge">ResetType</code> enums.</p>
 
 <p>Another option for performing a halting reset is by setting vector catch with the target’s <code class="highlighter-rouge">set_vector_catch()</code>
 method, then using a normal reset. This has the benefit of always halting at reset, if you leave the
@@ -381,7 +388,6 @@ <h2 id="notes">Notes</h2>
 </ul>
 
 
-
                 </div>
               </div>
             </main>