Skip to content

Commit 6ac803c

Browse files
xkaramanxkaraman
committed
Minor Typos and Fixes
1 parent 1d90e2a commit 6ac803c

8 files changed

+23
-54
lines changed

‎launch/amcl_stack.launch

-22
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,4 @@
33
<node name="amcl_stack" pkg="amcl" type="amcl" output="screen">
44
</node>
55

6-
<node name="amcl_relay" pkg="topic_tools" type="relay_field">
7-
<!-- Output -->
8-
<remap from="input" to="/amcl_pose"/>
9-
<remap from="output_topic" to="/amclpose"/>
10-
<remap from="output_type" to="geometry_msgs/PoseStamped"/>
11-
<remap from="expression" to="header:
12-
seq: m.header.seq
13-
stamp:
14-
secs: m.header.stamp.secs
15-
nsecs: m.header.stamp.nsecs
16-
frame_id: m.header.frame_id
17-
pose:
18-
position:
19-
x: m.pose.pose.position.x
20-
y: m.pose.pose.position.y
21-
z: m.pose.pose.position.z
22-
orientation:
23-
x: m.pose.pose.orientation.x
24-
y: m.pose.pose.orientation.y
25-
z: m.pose.pose.orientation.z
26-
w: m.pose.pose.orientation.w "/>
27-
</node>
286
</launch>

‎launch/gmapping_demo.launch

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<launch>
2-
<arg name="3d_sensor" default="$(env TURTLEBOT_3D_SENSOR)"/> <!-- r200, kinect, asus_xtion_pro -->
3-
<arg name="custom_gmapping_launch_file" default="$(find turtlebot_navigation)/launch/includes/gmapping/$(arg 3d_sensor)_gmapping.launch.xml"/>
2+
<arg name="3d_sensor" default="$(env TURTLEBOT_3D_SENSOR)"/>
3+
4+
<!-- r200, kinect, asus_xtion_pro -->
5+
<arg name="custom_gmapping_launch_file" default="$(find turtlebot_navigation)/launch/includes/gmapping/$(arg 3d_sensor)_gmapping.launch.xml"/>
6+
47
<include file="$(arg custom_gmapping_launch_file)"/>
5-
<!-- Launch turtlebot_navigation move_base with overiden parameters -->
6-
<include file="$(find turtlebot_navigation)/launch/includes/move_base.launch.xml"/>
7-
8-
8+
<!-- Launch turtlebot_navigation move_base with overiden parameters -->
9+
<include file="$(find turtlebot_navigation)/launch/includes/move_base.launch.xml"/>
910

1011
</launch>

‎launch/map_load.launch

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<launch>
2-
32
<arg name="map_file" default="$(find amcl_lib_pf)/maps/corridor/corridor.yaml"/>
43
<node name="map_server" pkg="map_server" type="map_server" output="screen" args="$(arg map_file)"/>
5-
6-
<!-- node name="tf_static" pkg="tf" type="static_transform_publisher" args="0 0 0 0 0 0 /map /odom 100" /-->
74
</launch>
85

‎launch/map_load_octomap.launch

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<launch>
2-
32
<arg name="map_file" default="$(find amcl_lib_pf)/maps/corridor/corridor.ot"/>
43
<node name="octomap_server" pkg="octomap_server" type="octomap_server_node" args="$(arg map_file)"/>
5-
64
</launch>
75

‎launch/octomap.launch

+13-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
<launch>
22

3-
<node pkg="octomap_server" type="octomap_server_node" name="octomap_server">
4-
<!-- args="$(find sim)/map.bt"> -->
3+
<node pkg="octomap_server" type="octomap_server_node" name="octomap_server">
4+
<!-- args="$(find sim)/map.bt"> -->
55

6-
<param name="resolution" value="0.05" />
7-
<param name="frame_id" type="string" value="/odom" />
8-
9-
<!-- maximum range to integrate (speedup!) -->
10-
<param name="sensor_model/max_range" value="5.0" />
11-
12-
<!-- data source to integrate (PointCloud2) -->
13-
<remap from="/cloud_in" to="/camera/depth/points" />
14-
15-
<!--remap from="tf_static" to="/tf" /-->
16-
17-
</node>
18-
19-
<node pkg="rviz" type="rviz" name="rviz"
20-
args="-d $(find amcl_lib_pf)/robot.rviz"
21-
/>
6+
<param name="resolution" value="0.05" />
7+
<param name="frame_id" type="string" value="/odom" />
8+
9+
<!-- maximum range to integrate (speedup!) -->
10+
<param name="sensor_model/max_range" value="5.0" />
11+
12+
<!-- data source to integrate (PointCloud2) -->
13+
<remap from="/cloud_in" to="/camera/depth/points" />
14+
</node>
15+
16+
<node pkg="rviz" type="rviz" name="rviz" args="-d $(find amcl_lib_pf)/robot.rviz"/>
2217

2318
</launch>
2419

‎launch/octomap_rviz.launch

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
Used for visualising the turtlebot while building a map or navigating with the ros navistack.
33
-->
44
<launch>
5-
<node name="rviz" pkg="rviz" type="rviz" args="-d $(find amcl_depth)/robot_octomap.rviz"/>
5+
<node name="rviz" pkg="rviz" type="rviz" args="-d $(find amcl_lib_pf)/robot_octomap.rviz"/>
66
</launch>

‎launch/rtab_rviz.launch

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
Used for visualising the turtlebot while building a map or navigating with the ros navistack.
33
-->
44
<launch>
5-
<node name="rviz" pkg="rviz" type="rviz" args="-d $(find amcl_lib_pf)/launch/includes/rtabrivz.rviz"/>
5+
<node name="rviz" pkg="rviz" type="rviz" args="-d $(find amcl_lib_pf)/launch/includes/rtabrivz.rviz"/>
66
</launch>

‎launch/willow-with-turtlebot.launch

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<arg name="base" value="$(optenv TURTLEBOT_BASE kobuki)"/> <!-- create, roomba -->
77
<arg name="battery" value="$(optenv TURTLEBOT_BATTERY /proc/acpi/battery/BAT0)"/> <!-- /proc/acpi/battery/BAT0 -->
8-
<arg name="gui" default="true"/>
8+
<arg name="gui" default="false"/>
99
<arg name="stacks" value="$(optenv TURTLEBOT_STACKS hexagons)"/> <!-- circles, hexagons -->
1010
<arg name="3d_sensor" value="$(optenv TURTLEBOT_3D_SENSOR kinect)"/> <!-- kinect, asus_xtion_pro -->
1111

0 commit comments

Comments
 (0)