Skip to content

Commit 0f20c6a

Browse files
committed
Update documentation
1 parent 48f336d commit 0f20c6a

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

_modules/roboticstoolbox/robot/ERobot.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ <h1>Source code for roboticstoolbox.robot.ERobot</h1><div class="highlight"><pre
10641064
<span class="n">end</span><span class="p">,</span> <span class="n">start</span><span class="p">,</span> <span class="n">etool</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_get_limit_links</span><span class="p">(</span><span class="n">end</span><span class="p">,</span> <span class="n">start</span><span class="p">)</span>
10651065

10661066
<span class="k">if</span> <span class="n">etool</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span> <span class="ow">and</span> <span class="n">tool</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
1067-
<span class="n">tool</span> <span class="o">=</span> <span class="p">(</span><span class="n">etool</span> <span class="o">@</span> <span class="n">tool</span><span class="p">)</span><span class="o">.</span><span class="n">A</span>
1067+
<span class="n">tool</span> <span class="o">=</span> <span class="p">(</span><span class="n">etool</span> <span class="o">*</span> <span class="n">tool</span><span class="p">)</span><span class="o">.</span><span class="n">A</span>
10681068
<span class="k">elif</span> <span class="n">etool</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
10691069
<span class="n">tool</span> <span class="o">=</span> <span class="n">etool</span><span class="o">.</span><span class="n">A</span>
10701070
<span class="k">elif</span> <span class="n">tool</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>

_modules/roboticstoolbox/robot/IK.html

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,14 @@ <h1>Source code for roboticstoolbox.robot.IK</h1><div class="highlight"><pre>
656656
<span class="n">tcount</span> <span class="o">=</span> <span class="mi">0</span> <span class="c1"># Total iteration count</span>
657657

658658
<span class="c1"># bool vector indicating revolute joints</span>
659-
<span class="n">revolutes</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">([</span><span class="n">link</span><span class="o">.</span><span class="n">isrevolute</span> <span class="k">for</span> <span class="n">link</span> <span class="ow">in</span> <span class="bp">self</span><span class="p">])</span>
659+
<span class="c1"># joints = np.array([link.isjoint for link in self])</span>
660+
<span class="c1"># revolutes = np.array([link.isrevolute for link in self])</span>
661+
<span class="n">revolutes</span> <span class="o">=</span> <span class="p">[]</span>
662+
663+
<span class="k">for</span> <span class="n">link</span> <span class="ow">in</span> <span class="bp">self</span><span class="p">:</span>
664+
<span class="k">if</span> <span class="n">link</span><span class="o">.</span><span class="n">isjoint</span><span class="p">:</span>
665+
<span class="n">revolutes</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">link</span><span class="o">.</span><span class="n">isrevolute</span><span class="p">)</span>
666+
<span class="n">revolutes</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">revolutes</span><span class="p">)</span>
660667

661668
<span class="n">q</span> <span class="o">=</span> <span class="n">q0</span>
662669
<span class="k">for</span> <span class="n">Tk</span> <span class="ow">in</span> <span class="n">T</span><span class="p">:</span>
@@ -692,6 +699,8 @@ <h1>Source code for roboticstoolbox.robot.IK</h1><div class="highlight"><pre>
692699
<span class="c1"># print(J)</span>
693700

694701
<span class="c1"># Wrap angles for revolute joints</span>
702+
<span class="nb">print</span><span class="p">(</span><span class="n">revolutes</span><span class="p">)</span>
703+
<span class="nb">print</span><span class="p">(</span><span class="n">q</span><span class="p">)</span>
695704
<span class="n">k</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">logical_and</span><span class="p">(</span><span class="n">q</span> <span class="o">&gt;</span> <span class="n">np</span><span class="o">.</span><span class="n">pi</span><span class="p">,</span> <span class="n">revolutes</span><span class="p">)</span>
696705
<span class="n">q</span><span class="p">[</span><span class="n">k</span><span class="p">]</span> <span class="o">-=</span> <span class="mi">2</span> <span class="o">*</span> <span class="n">np</span><span class="o">.</span><span class="n">pi</span>
697706

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy