Merge pull request #21 from Shokman/navigation_improvements

Some more work on navigation
cdrfiuba · Feb 23, 2018 · 060d44b · 060d44b
2 parents 9bf3861 + 3691089
commit 060d44b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/src/papa_navigation/launch/includes/move_base.launch.xml b/src/papa_navigation/launch/includes/move_base.launch.xml
@@ -31,7 +31,8 @@
     <param name="local_costmap/robot_base_frame" value="$(arg base_frame_id)"/>
     <param name="DWAPlannerROS/global_frame_id" value="$(arg odom_frame_id)"/>
 
-    <remap from="cmd_vel" to="navigation_velocity_smoother/raw_cmd_vel"/>
+    <!-- <remap from="cmd_vel" to="navigation_velocity_smoother/raw_cmd_vel"/> -->
+    <remap from="cmd_vel" to="cmd_vel"/>
     <remap from="odom" to="$(arg odom_topic)"/>
     <remap from="scan" to="$(arg laser_topic)"/>
   </node>

diff --git a/src/papa_navigation/param/costmap_common_params.yaml b/src/papa_navigation/param/costmap_common_params.yaml
@@ -22,21 +22,14 @@ obstacle_layer:
   z_resolution: 0.2
   z_voxels: 2
   publish_voxel_map: false
-  observation_sources:  scan bump
+  observation_sources:  scan
   scan:
     data_type: LaserScan
     topic: scan
     marking: true
     clearing: true
     min_obstacle_height: 0.25
     max_obstacle_height: 0.35
-  bump:
-    data_type: PointCloud2
-    topic: mobile_base/sensors/bumper_pointcloud
-    marking: true
-    clearing: false
-    min_obstacle_height: 0.0
-    max_obstacle_height: 0.15
   # for debugging only, let's you see the entire voxel grid
 
 #cost_scaling_factor and inflation_radius were now moved to the inflation_layer ns

diff --git a/src/papa_navigation/param/global_costmap_params.yaml b/src/papa_navigation/param/global_costmap_params.yaml
@@ -1,8 +1,10 @@
 global_costmap:
+   height: 50
+   width: 50
    global_frame: /map
    robot_base_frame: /base_footprint
-   update_frequency: 1.0
-   publish_frequency: 0.5
+   update_frequency: 2.0
+   publish_frequency: 2.0
    static_map: true
    transform_tolerance: 0.5
    plugins:

diff --git a/src/papa_navigation/param/local_costmap_params.yaml b/src/papa_navigation/param/local_costmap_params.yaml
@@ -3,12 +3,12 @@ local_costmap:
    robot_base_frame: /base_footprint
    update_frequency: 5.0
    publish_frequency: 2.0
-   static_map: false
-   rolling_window: true
+   static_map: true
+   rolling_window: false
    width: 4.0
    height: 4.0
    resolution: 0.05
    transform_tolerance: 0.5
    plugins:
     - {name: obstacle_layer,      type: "costmap_2d::VoxelLayer"}
-    - {name: inflation_layer,     type: "costmap_2d::InflationLayer"}
+    - {name: inflation_layer,     type: "costmap_2d::InflationLayer"}