From cab59f38e578e89b894620a6989321b3148422e5 Mon Sep 17 00:00:00 2001 From: Andreas Dolp Date: Tue, 13 Jun 2017 17:12:03 +0200 Subject: [PATCH 01/15] added trajectory_generator submodule --- .gitmodules | 3 +++ modules/drive_ros_trajectory_generator | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 modules/drive_ros_trajectory_generator diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..29f89de --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "modules/drive_ros_trajectory_generator"] + path = modules/drive_ros_trajectory_generator + url = https://github.com/tum-phoenix/drive_ros_trajectory_generator diff --git a/modules/drive_ros_trajectory_generator b/modules/drive_ros_trajectory_generator new file mode 160000 index 0000000..48b8c40 --- /dev/null +++ b/modules/drive_ros_trajectory_generator @@ -0,0 +1 @@ +Subproject commit 48b8c40530a8880f7bddfeca7a8a9ceeb183d5fd From 5bc7cc3d17f7585ef1bdf88f004885465bb34289 Mon Sep 17 00:00:00 2001 From: Andreas Dolp Date: Tue, 13 Jun 2017 17:12:51 +0200 Subject: [PATCH 02/15] removed example --- modules/exampleModule/CMakeLists.txt | 32 ---------------------------- modules/exampleModule/package.xml | 22 ------------------- 2 files changed, 54 deletions(-) delete mode 100644 modules/exampleModule/CMakeLists.txt delete mode 100644 modules/exampleModule/package.xml diff --git a/modules/exampleModule/CMakeLists.txt b/modules/exampleModule/CMakeLists.txt deleted file mode 100644 index 1e210cc..0000000 --- a/modules/exampleModule/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Minimum version required -cmake_minimum_required(VERSION 2.8.3) - -# Get the information about this package's buildtime dependencies -find_package(catkin REQUIRED - COMPONENTS std_msgs) - -# Declare the message files to be built -#add_message_files(FILES - -#) - -# Declare the service files to be built -#add_service_files(FILES - -#) - -# Actually generate the language-specific message and service files -#generate_messages(DEPENDENCIES std_msgs sensor_msgs) - -# Declare that this catkin package's runtime dependencies -#catkin_package( -# CATKIN_DEPENDS message_runtime std_msgs sensor_msgs -#) - -# define executable using MyMessage1 etc. -#add_executable(message_program src/main.cpp) -#add_dependencies(message_program ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) - -# define executable not using any messages/services provided by this package -#add_executable(does_not_use_local_messages_program src/main.cpp) -#add_dependencies(does_not_use_local_messages_program ${catkin_EXPORTED_TARGETS}) diff --git a/modules/exampleModule/package.xml b/modules/exampleModule/package.xml deleted file mode 100644 index 58e19ee..0000000 --- a/modules/exampleModule/package.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - test_package - 0.1.0 - The test package - - Your Name - BSD - http://wiki.ros.org/beginner_tutorials - Jane Doe - - catkin - - roscpp - rospy - std_msgs - - roscpp - rospy - std_msgs - - From c33ddd3ab315d5ff8f1761ff308a750a1912a741 Mon Sep 17 00:00:00 2001 From: Andreas Dolp Date: Tue, 13 Jun 2017 17:17:04 +0200 Subject: [PATCH 03/15] test --- modules/drive_ros_trajectory_generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/drive_ros_trajectory_generator b/modules/drive_ros_trajectory_generator index 48b8c40..7fc415c 160000 --- a/modules/drive_ros_trajectory_generator +++ b/modules/drive_ros_trajectory_generator @@ -1 +1 @@ -Subproject commit 48b8c40530a8880f7bddfeca7a8a9ceeb183d5fd +Subproject commit 7fc415cc7ea1d7803e51e3423e0c8a45575050cb From b68708e790a613a41f09b5c860fcf6e1a6ee2e6d Mon Sep 17 00:00:00 2001 From: Andreas Dolp Date: Tue, 13 Jun 2017 17:38:24 +0200 Subject: [PATCH 04/15] cleaned up trajectory_generator --- modules/drive_ros_trajectory_generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/drive_ros_trajectory_generator b/modules/drive_ros_trajectory_generator index 7fc415c..3b9e5b4 160000 --- a/modules/drive_ros_trajectory_generator +++ b/modules/drive_ros_trajectory_generator @@ -1 +1 @@ -Subproject commit 7fc415cc7ea1d7803e51e3423e0c8a45575050cb +Subproject commit 3b9e5b42996067ed5a50ea92f2837d5c967b40de From 7f0b50fc5c8b9045858c55cf415ae738fe69e5b7 Mon Sep 17 00:00:00 2001 From: Fabian H Date: Tue, 13 Jun 2017 21:53:03 +0200 Subject: [PATCH 05/15] update to newest travis version --- .travis.yml | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b011719..b46ec16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,39 @@ services: env: global: - toolset_branch: master - - server_type: travis - - ros_release_name: kinetic - - ubuntu_version_name: xenial + - ros_release: kinetic + - ubuntu_version: xenial + - docker_image: "shadowrobot/build-tools:$ubuntu_version-$ros_release" - used_modules: check_build #check_cache,code_style_check,check_deb_make,codecov_tool - - remote_shell_script: 'https://raw.githubusercontent.com/shadow-robot/sr-build-tools/$toolset_branch/bin/sr-run-ci-build.sh' +before_install: + # pull docker image from shadowrobot + - docker pull $docker_image + script: - - curl -s "$( echo "$remote_shell_script" | sed 's/#/%23/g' )" | bash -x /dev/stdin "$toolset_branch" $server_type $used_modules +# run docker image from shadowrobot in ansible working directory and and with travis build dir as mounted volume +# bash command to run in docker container consists of +# - download ximea drivers +# - extract ximea drivers +# - remove udevadm command in ximea install script (because it does not work in the docker container) +# - auto approval of firewire camera warning in ximea install script +# - install ximea drivers +# - pull latest ansible playbook files from sr robotics +# - checkout correct branch +# - run ansible playbook with provided parameters + + - > + docker run -w "/home/user/sr-build-tools/ansible" -v $TRAVIS_BUILD_DIR:/host$TRAVIS_BUILD_DIR + $docker_image + bash -c " + wget http://www.ximea.com/downloads/recent/XIMEA_Linux_SP.tgz && + tar xzf XIMEA_Linux_SP.tgz && + cd package && + sed -i -e 's/udevadm control --reload/echo removed command/g' scripts/install_steps && + sed -i -e 's/read choice/echo automatic approval/g' scripts/install_steps && + ./install && + cd .. && + git pull && + git checkout $toolset_branch && + sudo PYTHONUNBUFFERED=1 ansible-playbook -v -i \"localhost,\" -c local docker_site.yml --tags \"travis,$used_modules\" -e \"travis_repo_dir=/host$TRAVIS_BUILD_DIR travis_is_pull_request=$TRAVIS_PULL_REQUEST ros_release=$ros_release ubuntu_version=$ubuntu_version\" + " From bc478e98b969983135fa867e8d337e5dd4fe76f2 Mon Sep 17 00:00:00 2001 From: Fabian H Date: Tue, 13 Jun 2017 22:03:05 +0200 Subject: [PATCH 06/15] removed build badge from README --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 72f7948..44171c3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![Build Status](https://travis-ci.org/tum-phoenix/drive_ros_config.svg?branch=master)](https://travis-ci.org/tum-phoenix/drive_ros_config) - # ROS Configuration Repo This respository includes * ROS .launch files From 2bbceb131b8bd0461a56269b0ee5a7dc791af7b1 Mon Sep 17 00:00:00 2001 From: Andreas Dolp Date: Tue, 4 Jul 2017 17:54:31 +0200 Subject: [PATCH 07/15] updated submodule --- modules/drive_ros_trajectory_generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/drive_ros_trajectory_generator b/modules/drive_ros_trajectory_generator index 3b9e5b4..fe52980 160000 --- a/modules/drive_ros_trajectory_generator +++ b/modules/drive_ros_trajectory_generator @@ -1 +1 @@ -Subproject commit 3b9e5b42996067ed5a50ea92f2837d5c967b40de +Subproject commit fe52980b9cbcc027d982645b89ce6e05a3f15c09 From d3a432bc9acd6553c4cc64b99c1807a1e11adeec Mon Sep 17 00:00:00 2001 From: Fabian H Date: Sat, 7 Oct 2017 15:22:08 +0200 Subject: [PATCH 08/15] enable software tests in travis --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b46ec16..fa8f349 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ + sudo: required language: cpp @@ -11,7 +12,8 @@ env: - ros_release: kinetic - ubuntu_version: xenial - docker_image: "shadowrobot/build-tools:$ubuntu_version-$ros_release" - - used_modules: check_build #check_cache,code_style_check,check_deb_make,codecov_tool + - used_modules: check_build,software_tests #check_cache,code_style_check,check_deb_make,codecov_tool + # available modules: https://github.com/shadow-robot/sr-build-tools/blob/master/ansible/roles/ci/doc/modules.md before_install: # pull docker image from shadowrobot From acd7e1f74b07b6502fe18e656b0d2eecd5a5dc1f Mon Sep 17 00:00:00 2001 From: FaHa Date: Fri, 13 Oct 2017 12:56:20 +0200 Subject: [PATCH 09/15] updated project structure --- README.md | 14 ++++++++++++-- msg/example.msg | 0 2 files changed, 12 insertions(+), 2 deletions(-) delete mode 100644 msg/example.msg diff --git a/README.md b/README.md index 44171c3..af82c88 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,20 @@ # ROS Configuration Repo This respository includes * ROS .launch files -* ROS .msg files -* ROS packages as git submodules. +* ROS packages as [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) Some conventions: * only feature branches * push to master is not allowed * use pull requests + +Tip: +To change a branch in config repo, don't forget to deinit submodules first: +``` +cd ~/catkin_ws/src/drive_ros_config/ +git submodule deinit . +git checkout +git submodule init +git submodule update +``` + diff --git a/msg/example.msg b/msg/example.msg deleted file mode 100644 index e69de29..0000000 From 9905cb18a5130e3e0ee39d1b0c4fd65c9e545399 Mon Sep 17 00:00:00 2001 From: MaslinuPoimal Date: Mon, 23 Oct 2017 00:48:31 +0200 Subject: [PATCH 10/15] Bring structure up-to-date, add laserscan obstacle generation submodule and laserscanner drivers to submodules, adjust launch files --- .gitmodules | 9 +++++ configs/example.launch | 0 launch/cc2017_car.launch | 20 +++++++++++ launch/trajectory_generation.launch | 36 +++++++++++++++++++ modules/drive_ros_hokuyo | 1 + .../drive_ros_laserscan_obstacle_generator | 1 + modules/drive_ros_msgs | 1 + 7 files changed, 68 insertions(+) delete mode 100644 configs/example.launch create mode 100644 launch/cc2017_car.launch create mode 100644 launch/trajectory_generation.launch create mode 160000 modules/drive_ros_hokuyo create mode 160000 modules/drive_ros_laserscan_obstacle_generator create mode 160000 modules/drive_ros_msgs diff --git a/.gitmodules b/.gitmodules index 29f89de..1f399d2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,12 @@ [submodule "modules/drive_ros_trajectory_generator"] path = modules/drive_ros_trajectory_generator url = https://github.com/tum-phoenix/drive_ros_trajectory_generator +[submodule "modules/drive_ros_hokuyo"] + path = modules/drive_ros_hokuyo + url = https://github.com/tum-phoenix/drive_ros_hokuyo.git +[submodule "modules/drive_ros_laserscan_obstacle_generator"] + path = modules/drive_ros_laserscan_obstacle_generator + url = https://github.com/tum-phoenix/drive_ros_laserscan_obstacle_generator.git +[submodule "modules/drive_ros_msgs"] + path = modules/drive_ros_msgs + url = https://github.com/tum-phoenix/drive_ros_msgs.git diff --git a/configs/example.launch b/configs/example.launch deleted file mode 100644 index e69de29..0000000 diff --git a/launch/cc2017_car.launch b/launch/cc2017_car.launch new file mode 100644 index 0000000..a593fc4 --- /dev/null +++ b/launch/cc2017_car.launch @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/launch/trajectory_generation.launch b/launch/trajectory_generation.launch new file mode 100644 index 0000000..7f105a0 --- /dev/null +++ b/launch/trajectory_generation.launch @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/drive_ros_hokuyo b/modules/drive_ros_hokuyo new file mode 160000 index 0000000..37a91dd --- /dev/null +++ b/modules/drive_ros_hokuyo @@ -0,0 +1 @@ +Subproject commit 37a91dda01f485e6f9d4802125353d0730bd6d8f diff --git a/modules/drive_ros_laserscan_obstacle_generator b/modules/drive_ros_laserscan_obstacle_generator new file mode 160000 index 0000000..de53947 --- /dev/null +++ b/modules/drive_ros_laserscan_obstacle_generator @@ -0,0 +1 @@ +Subproject commit de53947df147066d31f316d70d3b0e7b54e64319 diff --git a/modules/drive_ros_msgs b/modules/drive_ros_msgs new file mode 160000 index 0000000..980008e --- /dev/null +++ b/modules/drive_ros_msgs @@ -0,0 +1 @@ +Subproject commit 980008e71480784d78974e247a6fa1141500fb84 From a3a3328ae01728a66efa5f8d5d0dc8d0e0dcd4ad Mon Sep 17 00:00:00 2001 From: FaHa Date: Wed, 1 Nov 2017 13:34:54 +0100 Subject: [PATCH 11/15] moving cc2017.launch file to sparate repo --- .gitmodules | 3 +++ launch/cc2017_car.launch | 20 -------------------- launch/trajectory_generation.launch | 2 +- modules/drive_ros_cc2017_car | 1 + 4 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 launch/cc2017_car.launch create mode 160000 modules/drive_ros_cc2017_car diff --git a/.gitmodules b/.gitmodules index 1f399d2..0bd3c6b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "modules/drive_ros_msgs"] path = modules/drive_ros_msgs url = https://github.com/tum-phoenix/drive_ros_msgs.git +[submodule "modules/drive_ros_cc2017_car"] + path = modules/drive_ros_cc2017_car + url = https://github.com/tum-phoenix/drive_ros_cc2017_car diff --git a/launch/cc2017_car.launch b/launch/cc2017_car.launch deleted file mode 100644 index a593fc4..0000000 --- a/launch/cc2017_car.launch +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/launch/trajectory_generation.launch b/launch/trajectory_generation.launch index 7f105a0..843ecb0 100644 --- a/launch/trajectory_generation.launch +++ b/launch/trajectory_generation.launch @@ -14,7 +14,7 @@ --> - + diff --git a/modules/drive_ros_cc2017_car b/modules/drive_ros_cc2017_car new file mode 160000 index 0000000..4c68a72 --- /dev/null +++ b/modules/drive_ros_cc2017_car @@ -0,0 +1 @@ +Subproject commit 4c68a72232eac65a9b5396874aa4563f89dbf40a From e94cd957cf275af4cfdc4ea75c75e7d66df144ef Mon Sep 17 00:00:00 2001 From: Fabian H Date: Wed, 1 Nov 2017 16:56:24 +0100 Subject: [PATCH 12/15] remove camera node from launch --- launch/trajectory_generation.launch | 5 ----- 1 file changed, 5 deletions(-) diff --git a/launch/trajectory_generation.launch b/launch/trajectory_generation.launch index 843ecb0..68e4019 100644 --- a/launch/trajectory_generation.launch +++ b/launch/trajectory_generation.launch @@ -8,11 +8,6 @@ - - - From 7b0c3b77cbba8073a57df311a183eacebffb5f9b Mon Sep 17 00:00:00 2001 From: Fabian H Date: Wed, 1 Nov 2017 17:17:10 +0100 Subject: [PATCH 13/15] added ximea importer --- launch/trajectory_generation.launch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/launch/trajectory_generation.launch b/launch/trajectory_generation.launch index 68e4019..a13a8a6 100644 --- a/launch/trajectory_generation.launch +++ b/launch/trajectory_generation.launch @@ -12,6 +12,11 @@ + + + From 2f0d01e93bae42dbbbd56c28aa9996ea5ddaec26 Mon Sep 17 00:00:00 2001 From: FaHa Date: Wed, 1 Nov 2017 20:19:02 +0100 Subject: [PATCH 14/15] added ros_common_drivers --- .gitmodules | 3 +++ modules/drive_ros_driver_common | 1 + 2 files changed, 4 insertions(+) create mode 160000 modules/drive_ros_driver_common diff --git a/.gitmodules b/.gitmodules index 0bd3c6b..964ae34 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "modules/drive_ros_cc2017_car"] path = modules/drive_ros_cc2017_car url = https://github.com/tum-phoenix/drive_ros_cc2017_car +[submodule "modules/drive_ros_driver_common"] + path = modules/drive_ros_driver_common + url = https://github.com/tum-phoenix/drive_ros_driver_common diff --git a/modules/drive_ros_driver_common b/modules/drive_ros_driver_common new file mode 160000 index 0000000..8aa2777 --- /dev/null +++ b/modules/drive_ros_driver_common @@ -0,0 +1 @@ +Subproject commit 8aa2777173acaac87bd9f6a52ea29b214e63d02a From 01b54ac84ccf7d81f28adb2aab153134161c1b6f Mon Sep 17 00:00:00 2001 From: Fabian H Date: Wed, 8 Nov 2017 14:22:56 +0100 Subject: [PATCH 15/15] Delete README.md --- README.md | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index af82c88..0000000 --- a/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# ROS Configuration Repo -This respository includes -* ROS .launch files -* ROS packages as [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) - -Some conventions: -* only feature branches -* push to master is not allowed -* use pull requests - -Tip: -To change a branch in config repo, don't forget to deinit submodules first: -``` -cd ~/catkin_ws/src/drive_ros_config/ -git submodule deinit . -git checkout -git submodule init -git submodule update -``` -