Skip to content

Commit fa9ad32

Browse files
xgroleaug-lesssardEtienne
authored
Fix/megageniales fixes nav stack (#74)
* Fixed grid and bumped hivemind * WIP obstacles avoidance * bump hivemind * bump HM Co-authored-by: Gabriel Lessard <lesg2605@usherbrooke.ca> Co-authored-by: Etienne <vile2094@usherbrooke.ca>
1 parent 002b54c commit fa9ad32

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/swarmus_ros_navigation/config/base_global_planner_params.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ GlobalPlanner:
44

55
use_dijkstra: false # If true, use Dijkstra's algorithm. Otherwise, use A*.
66
use_quadratic: true # If true, use the quadratic approximation of the potential. Otherwise, use a simpler calculation
7-
use_grid_path: false # If true, create a path that follows the grid boundaries. Otherwise, use a gradient descent method
7+
use_grid_path: true # If true, create a path that follows the grid boundaries. Otherwise, use a gradient descent method
88
old_navfn_behavior: false # If true, the planner will mirror the behavior of navfn
99

1010
lethal_cost: 253 # Lethal cost (can be changed with dynamic reconfiguring)

src/swarmus_ros_navigation/config/costmap_common_params.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ obstacle_layer:
2020

2121
inflation_layer:
2222
enabled: true
23-
cost_scaling_factor: 2.5 # exponential rate at which the obstacle cost drops off (default: 10)
24-
inflation_radius: 1 # max. distance from an obstacle at which costs are incurred for planning paths.
23+
cost_scaling_factor: 2 # exponential rate at which the obstacle cost drops off (default: 10)
24+
inflation_radius: 0.5 # max. distance from an obstacle at which costs are incurred for planning paths.
2525

2626
staticmap_layer:
2727
unknow_cost_value: -1 # Value at which a map value is considered as unknown. If map doesn't use unknown, it will be considered occupied

src/swarmus_ros_navigation/config/move_base_params_pioneer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ controller_frequency: 20.0
33
planner_patience: 5.0
44
controller_patience: 15.0
55
conservative_reset_dist: 3.0
6-
planner_frequency: 0 #1
6+
planner_frequency: 2 #0
77
oscillation_timeout: 15.0
88
oscillation_distance: 0.05
99
holonomic_robot: false

src/swarmus_ros_navigation/launch/navigation.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<node pkg="move_base" type="move_base" respawn="false" name="move_base" output="screen">
88
<!-- Load common parameters of the local and global planner-->
99
<param name="base_local_planner" value="dwa_local_planner/DWAPlannerROS"/>
10-
<param name="base_global_planner" value="global_planner/GlobalPlanner"/>
10+
<!--param name="base_global_planner" value="global_planner/GlobalPlanner"/-->
1111

1212
<rosparam file="$(find swarmus_ros_navigation)/config/costmap_common_params.yaml" command="load" ns="global_costmap" subst_value="true"/>
1313
<rosparam file="$(find swarmus_ros_navigation)/config/costmap_common_params.yaml" command="load" ns="local_costmap" subst_value="true"/>

0 commit comments

Comments
 (0)