Skip to content

Commit 1eff027

Browse files
committed
FINALLY got a launch file that allows move_base and arc_ros nodes to be launched at same time... I think may putting it all in one file was the fix, but I'll look into that later. updated arc_stage to look for new config file.
1 parent bfcadcf commit 1eff027

File tree

3 files changed

+26
-4
lines changed

3 files changed

+26
-4
lines changed

arc_control/launch/record_1

-11.1 MB
Binary file not shown.

arc_control/launch/testing.launch

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,32 @@
11
<launch>
22
<!-- All content of ARC will be contained in the /arc namespace -->
33
<group ns="arc">
4-
<include file="$(find arc_stage)/launch/testing.launch" />
54
<group ns="test_bot">
6-
<include file="$(find arc_behaviour)/launch/testing.launch"/>
7-
<include file="$(find arc_navigation)/launch/testing.launch" />
5+
<include file="$(find arc_behaviour)/launch/default.launch" />
6+
7+
<!-- NAVIGATION SECTION -->
8+
<master auto="start"/>
9+
<param name="/use_sim_time" value="true"/>
10+
<include file="$(find arc_navigation)/move_base_config/move_base.xml"/>
11+
<node name="map_server" pkg="map_server" type="map_server" args="$(find arc_stage)/maps/config/arc_small.yaml" respawn="false" />
12+
<node name="fake_localization" pkg="fake_localization" type="fake_localization" respawn="false" />
13+
<node name="rviz" pkg="rviz" type="rviz" args="-d $(find arc_navigation)/single_robot.rviz" />
14+
15+
<!-- ARC_STAGE SECTION -->
16+
<param name="/use_sim_time" value="true"/>
17+
<node pkg="arc_stage" type="arc_stage" name="arc_stage" args="$(find arc_stage)/world/test_random_wander_ms.world" respawn="false" >
18+
<param name="base_watchdog_timeout" value="0.2"/>
19+
</node>
820
</group>
921
</group>
1022
</launch>
23+
24+
<!-- open a terminal, and
25+
source /opt/ros/kinetic/setup.bash
26+
source /home/votick/workspace/arc_ws/src
27+
roslaunch arc_control testing.launch
28+
29+
This works fine on willow map.
30+
This works on custom random_wander_ms.world
31+
Using local arc_stage parameters for navigation stack [YES]
32+
-->

arc_stage/src/stageros.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#include "tf/transform_broadcaster.h"
5757

5858
#include <dynamic_reconfigure/server.h>
59-
#include <stage_ros/StageRosConfig.h>
59+
#include <arc_stage/StageRosConfig.h>
6060

6161
#define USAGE "stageros <worldfile>"
6262
#define IMAGE "image"

0 commit comments

Comments
 (0)