Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trajectory Generator #5

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
18 changes: 18 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[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
[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
42 changes: 36 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

sudo: required

language: cpp
Expand All @@ -8,11 +9,40 @@ services:
env:
global:
- toolset_branch: master
- server_type: travis
- ros_release_name: kinetic
- ubuntu_version_name: xenial
- 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'
- ros_release: kinetic
- ubuntu_version: xenial
- docker_image: "shadowrobot/build-tools:$ubuntu_version-$ros_release"
- 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
- 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\"
"
12 changes: 0 additions & 12 deletions README.md

This file was deleted.

Empty file removed configs/example.launch
Empty file.
36 changes: 36 additions & 0 deletions launch/trajectory_generation.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<launch>

<!-- TOP LEVEL LAUNCH FILE -->

<!-- vehicle name e.g. cc2017_car -->
<arg name="vehicle" value="cc2017_car"/>

<!-- vehicle name e.g. cc2017_car -->
<arg name="vehicle" value="cc2017_car"/>

<!-- Vehicle specific -->
<include file="$(find drive_ros_cc2017_car)/launch/tf_pub.launch" />

<arg name="scan_topic" value="/scan"/>

<!-- Camera Node -->
<!-- <include file="$(find drive_ros_ximea_importer)/launch/ximea_camera.launch" ns="camera">
<arg name="vehicle" value="$(arg vehicle)" />
</include> -->

<!-- LIDAR Node -->
<include file="$(find hokuyo_node)/launch/hokuyo_phoenix.launch" ns="lidar">
<arg name="scan_topic" value="$(arg scan_topic)"/>
</include>

<!-- Obstacle from LIDAR -->
<include file="$(find laserscan_obstacle_generator)/launch/laserscan_obstacle_generator.launch" ns="lidar">
<arg name="scan_topic" value="$(arg scan_topic)"/>
</include>

<!--- Mavlink Nodes -->
<!-- <include file="$(find mavlink_phoenix)/launch/mavlink_CC2016.launch" ns="mavlink" />
<include file="$(find mavlink_phoenix_device)/launch/mavlink_device.launch" ns="mavlink" />-->


</launch>
1 change: 1 addition & 0 deletions modules/drive_ros_cc2017_car
Submodule drive_ros_cc2017_car added at 4c68a7
1 change: 1 addition & 0 deletions modules/drive_ros_driver_common
1 change: 1 addition & 0 deletions modules/drive_ros_hokuyo
Submodule drive_ros_hokuyo added at 37a91d
1 change: 1 addition & 0 deletions modules/drive_ros_msgs
Submodule drive_ros_msgs added at 980008
1 change: 1 addition & 0 deletions modules/drive_ros_trajectory_generator
32 changes: 0 additions & 32 deletions modules/exampleModule/CMakeLists.txt

This file was deleted.

22 changes: 0 additions & 22 deletions modules/exampleModule/package.xml

This file was deleted.

Empty file removed msg/example.msg
Empty file.