Merge branch 'ros-navigation:master' into coffinfish-patch-1

Author: coffinfish

configuration/packages/configuring-bt-navigator.rst

@@ -159,7 +159,7 @@ Parameters
   ====== =========
 
   Description
-    Path to behavior tree XML description.
+    Robot base frame.
 
 :odom_topic:
 

configuration/packages/configuring-mppic.rst

@@ -669,7 +669,7 @@ This critic incentivizes navigating away from obstacles and critical collisions
   ============== ===========================
 
   Description
-    Cost to apply to a pose with any point in in inflated space to prefer distance from obstacles.
+    Cost to apply to a pose with any point in inflated space to prefer distance from obstacles.
 
 
 :near_goal_distance:

setup_guides/sdf/setup_sdf.rst

@@ -118,14 +118,12 @@ Here is the SDF version of the URDF code:
             </size></box>
           </geometry>
         </collision>
-
-        <xacro:box_inertia m="15" w="${base_width}" d="${base_length}" h="${base_height}"/>
       </link>
 
       <!-- Robot Footprint -->
       <link name='base_footprint'>
         <pose relative_to="base_joint"/>
-        <xacro:box_inertia m="0" w="0" d="0" h="0"/>
+        <xacro:box_inertia m="15" w="${base_width}" d="${base_length}" h="${base_height}"/>
       </link>
 
       <joint name='base_joint' type='fixed'>
@@ -234,6 +232,8 @@ Now build and source your package and launch ``display.launch.py``:
   source install/setup.bash
   ros2 launch sam_bot_description display.launch.py
 
+.. note:: You may get a warning like ``[kdl_parser]: The root link base_link has an inertia specified in the URDF, but KDL does not support a root link with an inertia. As a workaround, you can add an extra dummy link to your URDF.`` This warning can be safely ignored as it is just a quirk of the conversion from SDF to URDF.
+
 .. image:: ../urdf/images/base-bot_3.png
 
 Conclusion

setup_guides/urdf/setup_urdf.rst

@@ -398,7 +398,7 @@ Let us first define macros containing the inertial properties of the geometric p
       </inertial>
     </xacro:macro>
 
-Let us start by adding collision areas to our ``base_link`` using the ``<collision>`` tag. We will also be using the box_inertia macro we defined before to add some inertial properties to our ``base_link``. Include the following code snippet within ``<link name="base_link">`` tag of base_link in our URDF.
+Let us start by adding collision areas to our ``base_link`` using the ``<collision>`` tag. Include the following code snippet within ``<link name="base_link">`` tag of ``base_link`` in our URDF.
 
 .. code-block:: xml
   :lineno-start: 52
@@ -409,7 +409,14 @@ Let us start by adding collision areas to our ``base_link`` using the ``<collisi
         </geometry>
       </collision>
 
-      <xacro:box_inertia m="15" w="${base_width}" d="${base_length}" h="${base_height}"/>
+We will also be using the box_inertia macro we defined before to add some inertial properties to our ``base_link``.
+The ``kdl_parser`` package used in ``robot_state_publisher`` doesn't like inertial properties being specified in the root link, in this case the ``base_link``, to combat this we will be including them in the ``base_footprint`` instead.
+Include the following code snippet within ``<link name="base_footprint">`` tag of ``base_footprint`` in our URDF.
+
+.. code-block:: xml
+  :lineno-start: 62
+
+       <xacro:box_inertia m="15" w="${base_width}" d="${base_length}" h="${base_height}"/>
 
 Next, let us do the same for our wheel macros. Include the following code snippet within the ``<link name="${prefix}_link">`` tag of our wheel macros in our URDF.