Skip to content

Commit 2c2da90

Browse files
1 parent e912e75 commit 2c2da90

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+613
-471
lines changed

doxygen_cxx/classdrake_1_1systems_1_1controllers_1_1_joint_stiffness_controller-members.html

Lines changed: 172 additions & 171 deletions
Large diffs are not rendered by default.

doxygen_cxx/classdrake_1_1systems_1_1controllers_1_1_joint_stiffness_controller.html

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@
172172

173173
<p>Implements a joint-space stiffness controller of the form. </p>
174174
<pre>
175-
τ_control = −τ_g(q) − τ_app + kp⊙(q_d − q) + kd⊙(v_d − v)
176-
</pre><p> where <code>Kp</code> and <code>Kd</code> are the joint stiffness and damping coefficients, respectively, <code>τ_g(q)</code> is the vector of generalized forces due to gravity, and <code>τ_app</code> contains applied forces from force elements added to the multibody model (this can include damping, springs, etc. See MultibodyPlant::CalcForceElementsContribution()). <code>q_d</code> and <code>v_d</code> are the desired (setpoint) values for the multibody positions and velocities, respectively. <code>kd</code> and <code>kp</code> are taken as vectors, and ⊙ represents elementwise multiplication.</p>
175+
τ_control = B⁻¹[−τ_g(q) − τ_app + kp⊙(q_d − q) + kd⊙(v_d − v)]
176+
</pre><p> where <code>Kp</code> and <code>Kd</code> are the joint stiffness and damping coefficients, respectively, <code>τ_g(q)</code> is the vector of generalized forces due to gravity, and <code>τ_app</code> contains applied forces from force elements added to the multibody model (this can include damping, springs, etc. See MultibodyPlant::CalcForceElementsContribution()). B⁻¹ is the inverse of the actuation matrix. <code>q_d</code> and <code>v_d</code> are the desired (setpoint) values for the multibody positions and velocities, respectively. <code>kd</code> and <code>kp</code> are taken as vectors, and ⊙ represents elementwise multiplication.</p>
177177
<p>The goal of this controller is to produce a closed-loop dynamics that resembles a spring-damper dynamics at the joints around the setpoint: </p><pre>
178178
M(q)v̇ + C(q,v)v + kp⊙(q - q_d) + kd⊙(v - v_d) = τ_ext,
179179
</pre><p> where <code>M(q)v̇ + C(q,v)v</code> are the original multibody mass and Coriolis terms, and <code>τ_ext</code> are any external generalized forces that can arise, e.g. from contact forces.</p>
@@ -188,7 +188,7 @@
188188
</table>
189189
</td><td align="center" style="border:solid;padding-left:20px;padding-right:20px;vertical-align:middle" bgcolor="#F0F0F0"><a class="el" href="classdrake_1_1systems_1_1controllers_1_1_joint_stiffness_controller.html" title="Implements a joint-space stiffness controller of the form.">JointStiffnessController</a></td><td style="vertical-align:middle"><table cellspacing="0" cellpadding="0">
190190
<tr>
191-
<td align="left" style="padding:5px 0px 5px 0px">&rarr; generalized_force</td></tr>
191+
<td align="left" style="padding:5px 0px 5px 0px">&rarr; actuation</td></tr>
192192
</table>
193193
</td></tr>
194194
</table>
@@ -225,6 +225,9 @@
225225
<tr class="memitem:ae1296b665521a703cc08e6d98f5b6f64"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="classdrake_1_1systems_1_1_output_port.html">OutputPort</a>&lt; T &gt; &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classdrake_1_1systems_1_1controllers_1_1_joint_stiffness_controller.html#ae1296b665521a703cc08e6d98f5b6f64">get_output_port_generalized_force</a> () const</td></tr>
226226
<tr class="memdesc:ae1296b665521a703cc08e6d98f5b6f64"><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns the output port for the generalized forces implementing the control. <a href="#ae1296b665521a703cc08e6d98f5b6f64">More...</a><br /></td></tr>
227227
<tr class="separator:ae1296b665521a703cc08e6d98f5b6f64"><td class="memSeparator" colspan="2">&#160;</td></tr>
228+
<tr class="memitem:a02ffa2d9b80c4b46003312db5e69e35c"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="classdrake_1_1systems_1_1_output_port.html">OutputPort</a>&lt; T &gt; &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classdrake_1_1systems_1_1controllers_1_1_joint_stiffness_controller.html#a02ffa2d9b80c4b46003312db5e69e35c">get_output_port_actuation</a> () const</td></tr>
229+
<tr class="memdesc:a02ffa2d9b80c4b46003312db5e69e35c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns the output port implementing the control in the form (and order) expected for the plant's actuation input port. <a href="#a02ffa2d9b80c4b46003312db5e69e35c">More...</a><br /></td></tr>
230+
<tr class="separator:a02ffa2d9b80c4b46003312db5e69e35c"><td class="memSeparator" colspan="2">&#160;</td></tr>
228231
<tr class="memitem:a1f94d1c2b9f9f4bfba53ce45e3ec917e"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="classdrake_1_1multibody_1_1_multibody_plant.html">multibody::MultibodyPlant</a>&lt; T &gt; &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classdrake_1_1systems_1_1controllers_1_1_joint_stiffness_controller.html#a1f94d1c2b9f9f4bfba53ce45e3ec917e">get_multibody_plant</a> () const</td></tr>
229232
<tr class="memdesc:a1f94d1c2b9f9f4bfba53ce45e3ec917e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns a constant pointer to the MultibodyPlant used for control. <a href="#a1f94d1c2b9f9f4bfba53ce45e3ec917e">More...</a><br /></td></tr>
230233
<tr class="separator:a1f94d1c2b9f9f4bfba53ce45e3ec917e"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -1548,6 +1551,25 @@ <h2 class="memtitle"><span class="permalink"><a href="#a1f94d1c2b9f9f4bfba53ce45
15481551

15491552
<p>Returns a constant pointer to the MultibodyPlant used for control. </p>
15501553

1554+
</div>
1555+
</div>
1556+
<a id="a02ffa2d9b80c4b46003312db5e69e35c"></a>
1557+
<h2 class="memtitle"><span class="permalink"><a href="#a02ffa2d9b80c4b46003312db5e69e35c">&#9670;&nbsp;</a></span>get_output_port_actuation()</h2>
1558+
1559+
<div class="memitem">
1560+
<div class="memproto">
1561+
<table class="memname">
1562+
<tr>
1563+
<td class="memname">const <a class="el" href="classdrake_1_1systems_1_1_output_port.html">OutputPort</a>&lt;T&gt;&amp; get_output_port_actuation </td>
1564+
<td>(</td>
1565+
<td class="paramname"></td><td>)</td>
1566+
<td> const</td>
1567+
</tr>
1568+
</table>
1569+
</div><div class="memdoc">
1570+
1571+
<p>Returns the output port implementing the control in the form (and order) expected for the plant's actuation input port. </p>
1572+
15511573
</div>
15521574
</div>
15531575
<a id="ae1296b665521a703cc08e6d98f5b6f64"></a>
@@ -1566,6 +1588,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ae1296b665521a703cc08e6d9
15661588
</div><div class="memdoc">
15671589

15681590
<p>Returns the output port for the generalized forces implementing the control. </p>
1591+
<p>(Deprecated.) </p><dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000006">Deprecated:</a></b></dt><dd>Use get_output_port_actuation() instead, which multiplies the generalized force by B⁻¹ to be consumed by MultibodyPlant's actuation input port. <br />
1592+
This will be removed from Drake on or after 2025-04-01.</dd></dl>
15691593

15701594
</div>
15711595
</div>

doxygen_cxx/classdrake_1_1systems_1_1controllers_1_1_joint_stiffness_controller.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doxygen_cxx/classdrake_1_1systems_1_1sensors_1_1_rgbd_sensor.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a705ec3567a892f2c558988b4
15211521
</div><div class="memdoc">
15221522

15231523
<p>(Deprecated.) </p>
1524-
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000006">Deprecated:</a></b></dt><dd>Use default_color_render_camera().core().intrinsics() instead. <br />
1524+
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000007">Deprecated:</a></b></dt><dd>Use default_color_render_camera().core().intrinsics() instead. <br />
15251525
This will be removed from Drake on or after 2025-01-01.</dd></dl>
15261526

15271527
</div>
@@ -1561,7 +1561,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#acaff289a0608d413a89eac13
15611561
</div><div class="memdoc">
15621562

15631563
<p>(Deprecated.) </p>
1564-
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000008">Deprecated:</a></b></dt><dd>Use default_color_render_camera() instead. <br />
1564+
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000009">Deprecated:</a></b></dt><dd>Use default_color_render_camera() instead. <br />
15651565
This will be removed from Drake on or after 2025-01-01.</dd></dl>
15661566

15671567
</div>
@@ -1658,7 +1658,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a5b92b9d4b4aa8e028888b01f
16581658
</div><div class="memdoc">
16591659

16601660
<p>(Deprecated.) </p>
1661-
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000007">Deprecated:</a></b></dt><dd>Use default_depth_render_camera().core().intrinsics() instead. <br />
1661+
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000008">Deprecated:</a></b></dt><dd>Use default_depth_render_camera().core().intrinsics() instead. <br />
16621662
This will be removed from Drake on or after 2025-01-01.</dd></dl>
16631663

16641664
</div>
@@ -1717,7 +1717,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a2b7e6767e2c01173872ad2b1
17171717
</div><div class="memdoc">
17181718

17191719
<p>(Deprecated.) </p>
1720-
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000009">Deprecated:</a></b></dt><dd>Use default_depth_render_camera() instead. <br />
1720+
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000010">Deprecated:</a></b></dt><dd>Use default_depth_render_camera() instead. <br />
17211721
This will be removed from Drake on or after 2025-01-01.</dd></dl>
17221722

17231723
</div>
@@ -1909,7 +1909,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a22ff82441df0b9b743906c43
19091909
</div><div class="memdoc">
19101910

19111911
<p>(Deprecated.) </p>
1912-
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000013">Deprecated:</a></b></dt><dd>Use default_parent_frame_id() instead. <br />
1912+
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000014">Deprecated:</a></b></dt><dd>Use default_parent_frame_id() instead. <br />
19131913
This will be removed from Drake on or after 2025-01-01.</dd></dl>
19141914

19151915
</div>
@@ -2149,7 +2149,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ab8817bc0f987f64e506b92be
21492149
</div><div class="memdoc">
21502150

21512151
<p>(Deprecated.) </p>
2152-
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000011">Deprecated:</a></b></dt><dd>Use default_color_render_camera().core().sensor_pose_in_camera_body() instead. <br />
2152+
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000012">Deprecated:</a></b></dt><dd>Use default_color_render_camera().core().sensor_pose_in_camera_body() instead. <br />
21532153
This will be removed from Drake on or after 2025-01-01.</dd></dl>
21542154

21552155
</div>
@@ -2170,7 +2170,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ad83228b39a7566b1cf862392
21702170
</div><div class="memdoc">
21712171

21722172
<p>(Deprecated.) </p>
2173-
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000012">Deprecated:</a></b></dt><dd>Use default_depth_render_camera().core().sensor_pose_in_camera_body() instead. <br />
2173+
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000013">Deprecated:</a></b></dt><dd>Use default_depth_render_camera().core().sensor_pose_in_camera_body() instead. <br />
21742174
This will be removed from Drake on or after 2025-01-01.</dd></dl>
21752175

21762176
</div>
@@ -2191,7 +2191,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#acfe6bdbdc50d1b6bff27e133
21912191
</div><div class="memdoc">
21922192

21932193
<p>(Deprecated.) </p>
2194-
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000010">Deprecated:</a></b></dt><dd>Use default_X_PB() instead. <br />
2194+
<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000011">Deprecated:</a></b></dt><dd>Use default_X_PB() instead. <br />
21952195
This will be removed from Drake on or after 2025-01-01.</dd></dl>
21962196

21972197
</div>

doxygen_cxx/deprecated.html

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,32 +175,35 @@
175175
<dt>Member <a class="el" href="namespacedrake_1_1symbolic.html#ad528f8f92173863f5029b979b9c5f36b">drake::symbolic::ExtractAndAppendVariablesFromExpression</a> (const <a class="el" href="classdrake_1_1symbolic_1_1_expression.html" title="Represents a symbolic form of an expression.">symbolic::Expression</a> &amp;e, VectorX&lt; Variable &gt; *vars, std::unordered_map&lt; symbolic::Variable::Id, int &gt; *map_var_to_index)</dt>
176176
<dd><a class="anchor" id="_deprecated000001"></a>Use the overloaded function with std::vector&lt;Variable&gt; instead of VectorX&lt;Variable&gt; <br />
177177
This will be removed from Drake on or after 2024-05-01. </dd>
178+
<dt>Member <a class="el" href="classdrake_1_1systems_1_1controllers_1_1_joint_stiffness_controller.html#ae1296b665521a703cc08e6d98f5b6f64">JointStiffnessController&lt; T &gt;::get_output_port_generalized_force</a> () const</dt>
179+
<dd><a class="anchor" id="_deprecated000006"></a>Use get_output_port_actuation() instead, which multiplies the generalized force by B⁻¹ to be consumed by MultibodyPlant's actuation input port. <br />
180+
This will be removed from Drake on or after 2025-04-01. </dd>
178181
<dt>Member <a class="el" href="classdrake_1_1geometry_1_1_mesh.html#a94c732bb0f167eab349228237a8fbe3c">Mesh::filename</a> () const</dt>
179182
<dd><a class="anchor" id="_deprecated000004"></a>Meshes can be defined from a file path or in memory data. Use Mesh::source() to determine if a filename is available. <br />
180183
This will be removed from Drake on or after 2025-04-01. </dd>
181184
<dt>Member <a class="el" href="classdrake_1_1systems_1_1sensors_1_1_rgbd_sensor.html#a705ec3567a892f2c558988b4ac3c351f">RgbdSensor::color_camera_info</a> () const</dt>
182-
<dd><a class="anchor" id="_deprecated000006"></a>Use default_color_render_camera().core().intrinsics() instead. <br />
185+
<dd><a class="anchor" id="_deprecated000007"></a>Use default_color_render_camera().core().intrinsics() instead. <br />
183186
This will be removed from Drake on or after 2025-01-01. </dd>
184187
<dt>Member <a class="el" href="classdrake_1_1systems_1_1sensors_1_1_rgbd_sensor.html#acaff289a0608d413a89eac135a4c8790">RgbdSensor::color_render_camera</a> () const</dt>
185-
<dd><a class="anchor" id="_deprecated000008"></a>Use default_color_render_camera() instead. <br />
188+
<dd><a class="anchor" id="_deprecated000009"></a>Use default_color_render_camera() instead. <br />
186189
This will be removed from Drake on or after 2025-01-01. </dd>
187190
<dt>Member <a class="el" href="classdrake_1_1systems_1_1sensors_1_1_rgbd_sensor.html#a5b92b9d4b4aa8e028888b01fd2f659dd">RgbdSensor::depth_camera_info</a> () const</dt>
188-
<dd><a class="anchor" id="_deprecated000007"></a>Use default_depth_render_camera().core().intrinsics() instead. <br />
191+
<dd><a class="anchor" id="_deprecated000008"></a>Use default_depth_render_camera().core().intrinsics() instead. <br />
189192
This will be removed from Drake on or after 2025-01-01. </dd>
190193
<dt>Member <a class="el" href="classdrake_1_1systems_1_1sensors_1_1_rgbd_sensor.html#a2b7e6767e2c01173872ad2b1d0a0f9ca">RgbdSensor::depth_render_camera</a> () const</dt>
191-
<dd><a class="anchor" id="_deprecated000009"></a>Use default_depth_render_camera() instead. <br />
194+
<dd><a class="anchor" id="_deprecated000010"></a>Use default_depth_render_camera() instead. <br />
192195
This will be removed from Drake on or after 2025-01-01. </dd>
193196
<dt>Member <a class="el" href="classdrake_1_1systems_1_1sensors_1_1_rgbd_sensor.html#a22ff82441df0b9b743906c4304135783">RgbdSensor::parent_frame_id</a> () const</dt>
194-
<dd><a class="anchor" id="_deprecated000013"></a>Use default_parent_frame_id() instead. <br />
197+
<dd><a class="anchor" id="_deprecated000014"></a>Use default_parent_frame_id() instead. <br />
195198
This will be removed from Drake on or after 2025-01-01. </dd>
196199
<dt>Member <a class="el" href="classdrake_1_1systems_1_1sensors_1_1_rgbd_sensor.html#ab8817bc0f987f64e506b92be652d5644">RgbdSensor::X_BC</a> () const</dt>
197-
<dd><a class="anchor" id="_deprecated000011"></a>Use default_color_render_camera().core().sensor_pose_in_camera_body() instead. <br />
200+
<dd><a class="anchor" id="_deprecated000012"></a>Use default_color_render_camera().core().sensor_pose_in_camera_body() instead. <br />
198201
This will be removed from Drake on or after 2025-01-01. </dd>
199202
<dt>Member <a class="el" href="classdrake_1_1systems_1_1sensors_1_1_rgbd_sensor.html#ad83228b39a7566b1cf862392f1e5e19a">RgbdSensor::X_BD</a> () const</dt>
200-
<dd><a class="anchor" id="_deprecated000012"></a>Use default_depth_render_camera().core().sensor_pose_in_camera_body() instead. <br />
203+
<dd><a class="anchor" id="_deprecated000013"></a>Use default_depth_render_camera().core().sensor_pose_in_camera_body() instead. <br />
201204
This will be removed from Drake on or after 2025-01-01. </dd>
202205
<dt>Member <a class="el" href="classdrake_1_1systems_1_1sensors_1_1_rgbd_sensor.html#acfe6bdbdc50d1b6bff27e133688a4230">RgbdSensor::X_PB</a> () const</dt>
203-
<dd><a class="anchor" id="_deprecated000010"></a>Use default_X_PB() instead. <br />
206+
<dd><a class="anchor" id="_deprecated000011"></a>Use default_X_PB() instead. <br />
204207
This will be removed from Drake on or after 2025-01-01.</dd>
205208
</dl>
206209
</div></div><!-- PageDoc -->

0 commit comments

Comments
 (0)