diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..bd7c526 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,24 @@ +[submodule "modules/drive_ros_mavlink_device"] + path = modules/drive_ros_mavlink_device + url = https://github.com/tum-phoenix/drive_ros_mavlink_device +[submodule "modules/drive_ros_hokuyo"] + path = modules/drive_ros_hokuyo + url = https://github.com/tum-phoenix/drive_ros_hokuyo +[submodule "modules/drive_ros_ximea_importer"] + path = modules/drive_ros_ximea_importer + url = https://github.com/tum-phoenix/drive_ros_ximea_importer.git +[submodule "modules/drive_ros_mavlink_test"] + path = modules/drive_ros_mavlink_test + url = https://github.com/tum-phoenix/drive_ros_mavlink_test +[submodule "modules/drive_ros_driver_common"] + path = modules/drive_ros_driver_common + url = https://github.com/tum-phoenix/drive_ros_driver_common +[submodule "modules/drive_ros_msgs"] + path = modules/drive_ros_msgs + url = https://github.com/tum-phoenix/drive_ros_msgs +[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_uavcan"] + path = modules/drive_ros_uavcan + url = https://github.com/tum-phoenix/drive_ros_uavcan diff --git a/.travis.yml b/.travis.yml index b46ec16..f0a5b7e 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 @@ -33,14 +35,15 @@ script: 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 && + wget -q 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 && + sudo pip install uavcan && + 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\" " diff --git a/README.md b/README.md deleted file mode 100644 index 44171c3..0000000 --- a/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# ROS Configuration Repo -This respository includes -* ROS .launch files -* ROS .msg files -* ROS packages as git submodules. - -Some conventions: -* only feature branches -* push to master is not allowed -* use pull requests diff --git a/configs/example.launch b/configs/example.launch deleted file mode 100644 index e69de29..0000000 diff --git a/launch/sensors.launch b/launch/sensors.launch new file mode 100644 index 0000000..18f74dc --- /dev/null +++ b/launch/sensors.launch @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + 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 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 diff --git a/modules/drive_ros_hokuyo b/modules/drive_ros_hokuyo new file mode 160000 index 0000000..12ef35a --- /dev/null +++ b/modules/drive_ros_hokuyo @@ -0,0 +1 @@ +Subproject commit 12ef35ac6d2ff52588d8284841e8b67905e462a9 diff --git a/modules/drive_ros_mavlink_device b/modules/drive_ros_mavlink_device new file mode 160000 index 0000000..55bd6b0 --- /dev/null +++ b/modules/drive_ros_mavlink_device @@ -0,0 +1 @@ +Subproject commit 55bd6b0936ef0343aeafc0785a455b653292f80c diff --git a/modules/drive_ros_mavlink_test b/modules/drive_ros_mavlink_test new file mode 160000 index 0000000..8bfcfba --- /dev/null +++ b/modules/drive_ros_mavlink_test @@ -0,0 +1 @@ +Subproject commit 8bfcfbacfcd0e5c87bf73f168fbe4f3f86dd2da2 diff --git a/modules/drive_ros_msgs b/modules/drive_ros_msgs new file mode 160000 index 0000000..9bf7a81 --- /dev/null +++ b/modules/drive_ros_msgs @@ -0,0 +1 @@ +Subproject commit 9bf7a81a79ee2f5f28f1f33abd22a88c7b30c300 diff --git a/modules/drive_ros_uavcan b/modules/drive_ros_uavcan new file mode 160000 index 0000000..fb09fae --- /dev/null +++ b/modules/drive_ros_uavcan @@ -0,0 +1 @@ +Subproject commit fb09faee4db4dd78eb1d7bb97fc1bea3bf2b08c6 diff --git a/modules/drive_ros_ximea_importer b/modules/drive_ros_ximea_importer new file mode 160000 index 0000000..90bee89 --- /dev/null +++ b/modules/drive_ros_ximea_importer @@ -0,0 +1 @@ +Subproject commit 90bee89fef72bb79e934c38b9dcbfa10ac0133a0 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 - - diff --git a/msg/example.msg b/msg/example.msg deleted file mode 100644 index e69de29..0000000