Skip to content

Commit dd1822f

Browse files
ipa-buildbotipa-buildbot
committed
Merge remote branch 'origin-ipa320/master' into automerge
2 parents 9dd29a5 + d8d6dd7 commit dd1822f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1870
-1455
lines changed

‎cob_2dnav/CMakeLists.txt

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
cmake_minimum_required(VERSION 2.4.6)
2+
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
3+
4+
# Set the build type. Options are:
5+
# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage
6+
# Debug : w/ debug symbols, w/o optimization
7+
# Release : w/o debug symbols, w/ optimization
8+
# RelWithDebInfo : w/ debug symbols, w/ optimization
9+
# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries
10+
#set(ROS_BUILD_TYPE RelWithDebInfo)
11+
12+
#rosbuild_find_ros_package(actionlib_msgs)
13+
#include(${actionlib_msgs_PACKAGE_PATH}/cmake/actionbuild.cmake)
14+
#genaction()
15+
16+
rosbuild_init()
17+
18+
#set the default path for built executables to the "bin" directory
19+
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
20+
#set the default path for built libraries to the "lib" directory
21+
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
22+
23+
#uncomment if you have defined messages
24+
#rosbuild_genmsg()
25+
#uncomment if you have defined services
26+
#rosbuild_gensrv()
27+
28+
#common commands for building c++ executables and libraries
29+
#rospack_add_library(${PROJECT_NAME} src/example.cpp)
30+
#target_link_libraries(${PROJECT_NAME} another_library)
31+
#rospack_add_boost_directories()
32+
#rospack_link_boost(${PROJECT_NAME} thread)
33+
#rospack_add_executable(example examples/example.cpp)
34+
#target_link_libraries(example ${PROJECT_NAME})
35+
36+
# rostest
37+
rosbuild_add_roslaunch_check(ros/launch/2dnav.launch ROBOT=cob3-3 ROBOT_ENV=ipa-kitchen)
38+
rosbuild_add_roslaunch_check(ros/launch/2dnav_local.launch ROBOT=cob3-3 ROBOT_ENV=ipa-kitchen)
39+
rosbuild_add_roslaunch_check(ros/launch/2dnav_slam.launch ROBOT=cob3-3 ROBOT_ENV=ipa-kitchen)

‎cob_generic_states/Makefile ‎cob_2dnav/Makefile

File renamed without changes.

‎cob_2dnav/ros/launch/2dnav_local.launch

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<!--- load common configuration files -->
1010
<rosparam file="$(find cob_2dnav)/ros/config/costmap_common_params.yaml" command="load" ns="global_costmap" />
1111
<rosparam file="$(find cob_2dnav)/ros/config/costmap_common_params.yaml" command="load" ns="local_costmap" />
12-
<rosparam file="$(find cob_2dnav)/ros/config/move_base_params.yaml" command="load" ns="global_costmap" />
1312

1413
<!--- load global navigation specific parameters -->
1514
<rosparam file="$(find cob_2dnav)/ros/config/local/local_costmap_params.yaml" command="load" />

‎cob_2dnav/ros/launch/2dnav_slam.launch

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<!-- dynamic map generation -->
55
<include file="$(find cob_2dslam)/ros/launch/gmapping.launch" />
66

7+
<!--- Run move base -->
78
<node pkg="move_base" type="move_base" respawn="false" name="move_base" output="screen">
89
<remap from="cmd_vel" to="base_controller/command"/>
910
<remap from="odom" to="base_controller/odometry"/>

‎cob_generic_states/CMakeLists.txt ‎cob_2dslam/CMakeLists.txt

+11-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
99
# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries
1010
#set(ROS_BUILD_TYPE RelWithDebInfo)
1111

12+
#rosbuild_find_ros_package(actionlib_msgs)
13+
#include(${actionlib_msgs_PACKAGE_PATH}/cmake/actionbuild.cmake)
14+
#genaction()
15+
1216
rosbuild_init()
1317

1418
#set the default path for built executables to the "bin" directory
@@ -22,9 +26,12 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
2226
#rosbuild_gensrv()
2327

2428
#common commands for building c++ executables and libraries
25-
#rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
29+
#rospack_add_library(${PROJECT_NAME} src/example.cpp)
2630
#target_link_libraries(${PROJECT_NAME} another_library)
27-
#rosbuild_add_boost_directories()
28-
#rosbuild_link_boost(${PROJECT_NAME} thread)
29-
#rosbuild_add_executable(example examples/example.cpp)
31+
#rospack_add_boost_directories()
32+
#rospack_link_boost(${PROJECT_NAME} thread)
33+
#rospack_add_executable(example examples/example.cpp)
3034
#target_link_libraries(example ${PROJECT_NAME})
35+
36+
# rostest
37+
rosbuild_add_roslaunch_check(ros/launch/2dslam.launch ROBOT=cob3-3 ROBOT_ENV=ipa-kitchen)

‎cob_2dslam/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include $(shell rospack find mk)/cmake.mk

‎cob_bringup/CMakeLists.txt

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
cmake_minimum_required(VERSION 2.4.6)
2+
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
3+
4+
# Set the build type. Options are:
5+
# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage
6+
# Debug : w/ debug symbols, w/o optimization
7+
# Release : w/o debug symbols, w/ optimization
8+
# RelWithDebInfo : w/ debug symbols, w/ optimization
9+
# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries
10+
#set(ROS_BUILD_TYPE RelWithDebInfo)
11+
12+
#rosbuild_find_ros_package(actionlib_msgs)
13+
#include(${actionlib_msgs_PACKAGE_PATH}/cmake/actionbuild.cmake)
14+
#genaction()
15+
16+
rosbuild_init()
17+
18+
#set the default path for built executables to the "bin" directory
19+
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
20+
#set the default path for built libraries to the "lib" directory
21+
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
22+
23+
#uncomment if you have defined messages
24+
#rosbuild_genmsg()
25+
#uncomment if you have defined services
26+
#rosbuild_gensrv()
27+
28+
#common commands for building c++ executables and libraries
29+
#rospack_add_library(${PROJECT_NAME} src/example.cpp)
30+
#target_link_libraries(${PROJECT_NAME} another_library)
31+
#rospack_add_boost_directories()
32+
#rospack_link_boost(${PROJECT_NAME} thread)
33+
#rospack_add_executable(example examples/example.cpp)
34+
#target_link_libraries(example ${PROJECT_NAME})
35+
36+
# rostest
37+
#rosbuild_add_roslaunch_check(ros/launch/cob3-1.launch ROBOT=cob3-1)
38+
#rosbuild_add_roslaunch_check(ros/launch/cob3-2.launch ROBOT=cob3-2)
39+
#rosbuild_add_roslaunch_check(ros/launch/cob3-3.launch ROBOT=cob3-3)
40+
41+
rosbuild_add_roslaunch_check(ros/launch/sim.launch ROBOT=cob3-3 ROBOT_ENV=ipa-kitchen)
42+
43+
# Check whether there's an X display. Intended to use in gating tests that
44+
# require a display.
45+
rosbuild_check_for_display(disp)
46+
47+
if(disp)
48+
rosbuild_add_rostest(ros/launch/sim.launch TIMEOUT 10.0)
49+
endif(disp)
50+
51+

‎cob_bringup/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include $(shell rospack find mk)/cmake.mk

‎cob_bringup/manifest.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
<license>LGPL</license>
99
<review status="unreviewed" notes=""/>
1010
<url>http://ros.org/wiki/cob_bringup</url>
11-
11+
12+
<depend package="robot_state_publisher"/>
13+
<depend package="robot_state_publisher"/>
14+
<depend package="cob_description"/>
1215
<depend package="cob_machine"/>
1316
<depend package="cob_tray"/>
1417
<depend package="cob_tray_sensors"/>
@@ -23,6 +26,7 @@
2326
<depend package="cob_hokuyo"/>
2427
<depend package="cob_joint_state_aggregator"/>
2528
<depend package="cob_gazebo"/>
29+
<depend package="cob_gazebo_worlds"/>
2630
<depend package="cob_light"/>
2731
<depend package="cob_manipulator"/>
2832
<depend package="cob_teleop"/>

‎cob_bringup/ros/launch/cob3-3.launch

-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
<remap from="/joint_states" to="/joint_states_combined"/>
1010
</node>
1111

12-
<!-- start nodelet manager -->
13-
<node pkg="nodelet" type="nodelet" name="nodelet_manager1" args="manager" output="screen"/>
14-
1512
<!-- startup hardware -->
1613
<!-- base -->
1714
<include file="$(find cob_base)/ros/launch/base.launch" />

‎cob_bringup/ros/launch/cob3-bosch.launch

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0"?>
2+
<launch>
3+
4+
<!--include file="$(find cob_machine)/$(env ROBOT).machine" /-->
5+
<include file="$(find cob_description)/ros/robots/upload_robot.launch" />
6+
7+
<!-- start robot_state_publisher -->
8+
<node pkg="robot_state_publisher" type="state_publisher" name="rob_st_pub">
9+
<remap from="/joint_states" to="/joint_states_combined"/>
10+
</node>
11+
12+
<!-- startup hardware -->
13+
<!-- base -->
14+
<include file="$(find cob_base)/ros/launch/base.launch" />
15+
<include file="$(find cob_relayboard)/ros/launch/relayboard.launch" />
16+
<include file="$(find cob_sick_s300)/ros/launch/front.launch" />
17+
<include file="$(find cob_sick_s300)/ros/launch/rear.launch" />
18+
19+
<!-- start additional packages -->
20+
<include file="$(find cob_joint_state_aggregator)/ros/launch/joint_state_aggregator.launch" />
21+
<include file="$(find cob_teleop)/ros/launch/teleop.launch" />
22+
23+
</launch>

‎cob_bringup/ros/launch/icob.launch

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0"?>
2+
<launch>
3+
4+
<!--include file="$(find cob_machine)/$(env ROBOT).machine" /-->
5+
<include file="$(find cob_description)/ros/robots/upload_robot.launch" />
6+
7+
<!-- start robot_state_publisher -->
8+
<node pkg="robot_state_publisher" type="state_publisher" name="rob_st_pub">
9+
</node>
10+
11+
<!-- startup hardware -->
12+
<!-- base -->
13+
<include file="$(find cob_base)/ros/launch/base.launch" />
14+
<include file="$(find cob_sick_s300)/ros/launch/front.launch" />
15+
<include file="$(find cob_sick_s300)/ros/launch/rear.launch" />
16+
17+
<include file="$(find cob_relayboard)/ros/launch/relayboard_sim.launch" />
18+
<include file="$(find cob_teleop)/ros/launch/teleop.launch" />
19+
<include file="$(find kinect_camera)/launch/kinect_node.launch" />
20+
21+
</launch>

‎cob_bringup/ros/launch/sim.launch

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<include file="$(find cob_gazebo_worlds)/ros/launch/$(env ROBOT_ENV).launch" />
88
<include file="$(find cob_gazebo)/ros/launch/robot.launch" />
99

10-
<!-- start nodelet manager -->
11-
<node pkg="nodelet" type="nodelet" name="nodelet_manager" args="manager" output="screen"/>
10+
<!-- start additional components -->
11+
<include file="$(find cob_sound)/ros/launch/sound.launch" />
1212

1313
</launch>

‎cob_dashboard/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/ros/lib)
2828
#rosbuild_link_boost(${PROJECT_NAME} thread)
2929
#rosbuild_add_executable(example examples/example.cpp)
3030
#target_link_libraries(example ${PROJECT_NAME})
31+
32+
rosbuild_add_roslaunch_check(ros/launch/dashboard.launch ROBOT=cob3-3 ROBOT_ENV=ipa-kitchen)

‎cob_dashboard/manifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<depend package="rospy"/>
1313
<depend package="cob_script_server"/>
1414
<depend package="cob_relayboard"/>
15+
<depend package="cob_default_config"/>
1516

1617
<python path="${prefix}/ros/src"/>
1718

‎cob_dashboard/ros/src/knoeppkes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def __init__(self):
113113
#self.vbox.pack_start(hbox, False, False, 5)
114114
hbox=gtk.HBox(True, 0)
115115
self.status_image = gtk.Image()
116-
self.status_image.set_from_file(roslib.packages.get_pkg_dir("cob_dashboard") + "/common/files/icons/weather-clear.png")
116+
#self.status_image.set_from_file(roslib.packages.get_pkg_dir("cob_dashboard") + "/common/files/icons/weather-clear.png")
117117
hbox.pack_start(self.status_image, False, False, 0)
118118
self.status_label = gtk.Label("Status OK")
119119
hbox.pack_start(self.status_label, False, False, 0)

‎cob_generic_states/mainpage.dox

-26
This file was deleted.

‎cob_generic_states/manifest.xml

-18
This file was deleted.

0 commit comments

Comments
 (0)