Skip to content

Commit

Permalink
Merge branch 'release/1.4.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
mbusy committed Sep 22, 2020
2 parents bcd8c5d + f894eb4 commit 46b7f3a
Show file tree
Hide file tree
Showing 76 changed files with 546 additions and 272 deletions.
2 changes: 1 addition & 1 deletion docs/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "qiBullet"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.4.1
PROJECT_NUMBER = 1.4.2

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion docs/api/annotated.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classes.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down Expand Up @@ -129,6 +129,7 @@
<tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>pose_init</b> (defined in <a class="el" href="classqibullet_1_1base__controller_1_1BaseController.html">qibullet.base_controller.BaseController</a>)</td><td class="entry"><a class="el" href="classqibullet_1_1base__controller_1_1BaseController.html">qibullet.base_controller.BaseController</a></td><td class="entry"></td></tr>
<tr bgcolor="#f0f0f0"><td class="entry"><b>robot_model</b> (defined in <a class="el" href="classqibullet_1_1robot__module_1_1RobotModule.html">qibullet.robot_module.RobotModule</a>)</td><td class="entry"><a class="el" href="classqibullet_1_1robot__module_1_1RobotModule.html">qibullet.robot_module.RobotModule</a></td><td class="entry"></td></tr>
<tr class="even"><td class="entry"><a class="el" href="classqibullet_1_1base__controller_1_1PepperBaseController.html#a390f4cd9f1084259dd6caf960c24d50c">setLinearVelocity</a>(self, linear_velocity)</td><td class="entry"><a class="el" href="classqibullet_1_1base__controller_1_1PepperBaseController.html">qibullet.base_controller.PepperBaseController</a></td><td class="entry"></td></tr>
<tr><td class="entry"><a class="el" href="classqibullet_1_1base__controller_1_1PepperBaseController.html#a5cdc408d50232392edbc94ac336c5f55">stopMove</a>(self)</td><td class="entry"><a class="el" href="classqibullet_1_1base__controller_1_1PepperBaseController.html">qibullet.base_controller.PepperBaseController</a></td><td class="entry"></td></tr>
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down Expand Up @@ -127,6 +127,8 @@
<tr class="separator:ac89e926706e8e95a0d426c82263932cb"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a5d224cb83cdb244c1e48a46db84ecf06"><td class="memItemLeft" align="right" valign="top">def&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classqibullet_1_1base__controller_1_1PepperBaseController.html#a5d224cb83cdb244c1e48a46db84ecf06">move</a> (self, x, y, theta)</td></tr>
<tr class="separator:a5d224cb83cdb244c1e48a46db84ecf06"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a5cdc408d50232392edbc94ac336c5f55"><td class="memItemLeft" align="right" valign="top">def&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classqibullet_1_1base__controller_1_1PepperBaseController.html#a5cdc408d50232392edbc94ac336c5f55">stopMove</a> (self)</td></tr>
<tr class="separator:a5cdc408d50232392edbc94ac336c5f55"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="inherit_header pub_methods_classqibullet_1_1base__controller_1_1BaseController"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_classqibullet_1_1base__controller_1_1BaseController')"><img src="closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="classqibullet_1_1base__controller_1_1BaseController.html">qibullet.base_controller.BaseController</a></td></tr>
<tr class="memitem:a875caeb35cb82c313069f03953936a87 inherit pub_methods_classqibullet_1_1base__controller_1_1BaseController"><td class="memItemLeft" align="right" valign="top">def&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classqibullet_1_1base__controller_1_1BaseController.html#a875caeb35cb82c313069f03953936a87">__init__</a> (self, robot_model, physicsClientId=0)</td></tr>
<tr class="separator:a875caeb35cb82c313069f03953936a87 inherit pub_methods_classqibullet_1_1base__controller_1_1BaseController"><td class="memSeparator" colspan="2">&#160;</td></tr>
Expand Down Expand Up @@ -442,6 +444,25 @@ <h2 class="groupheader">Member Function Documentation</h2>
</pre>
</div>
</div>
<a class="anchor" id="a5cdc408d50232392edbc94ac336c5f55"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">def qibullet.base_controller.PepperBaseController.stopMove </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>self</em></td><td>)</td>
<td></td>
</tr>
</table>
</div><div class="memdoc">
<pre class="fragment">If an aynchronous moveTo has been launched, calling this method will
stop the asynchronous process. Calling this method is equivalent to
calling moveTo(0.0, 0.0, 0.0, BaseController.FRAME_ROBOT, _async=True)
</pre>
</div>
</div>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1camera_1_1Camera-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1camera_1_1Camera.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1camera_1_1CameraDepth.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1camera_1_1CameraResolution.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1camera_1_1CameraRgb-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1camera_1_1CameraRgb.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1controller_1_1Controller.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1joint_1_1Joint-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1joint_1_1Joint.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1laser_1_1Laser-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1laser_1_1Laser.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1link_1_1Link-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/classqibullet_1_1link_1_1Link.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">qiBullet
&#160;<span id="projectnumber">1.4.1</span>
&#160;<span id="projectnumber">1.4.2</span>
</div>
<div id="projectbrief">Bullet-based python simulation for SoftBank Robotics&#39; robots.</div>
</td>
Expand Down
Loading

0 comments on commit 46b7f3a

Please sign in to comment.