Skip to content

Commit 292c9d5

Browse files
committed
Add meta & moveit pkgs
1 parent 5a40268 commit 292c9d5

10 files changed

+149
-1
lines changed

.kinetic_depends.rosinstall

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
- git:
2+
local-name: motoman_pkgs/motoman_moveit
3+
uri: https://github.com/ntl-ros-pkg/motoman_moveit.git
4+
version: master
5+
- git:
6+
local-name: motoman_pkgs/motoman_robot
7+
uri: https://github.com/ntl-ros-pkg/motoman_robot.git
8+
version: master
9+
- git:
10+
local-name: motoman_pkgs/motoman_simulator
11+
uri: https://github.com/ntl-ros-pkg/motoman_simulator.git
12+
version: master
13+
- git:
14+
local-name: motoman_deps/ntl_recognition
15+
uri: https://github.com/ntl-ros-pkg/ntl_recognition.git
16+
version: master
17+
- git:
18+
local-name: motoman_deps/dhand_ros_pkg
19+
uri: https://github.com/Nishida-Lab/dhand_ros_pkg
20+
version: master

.travis.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# This config file for Travis CI utilizes ros-industrial/industrial_ci package.
2+
# For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst
3+
sudo: required
4+
dist: trusty
5+
services:
6+
- docker
7+
language: generic
8+
compiler:
9+
- gcc
10+
#notifications:
11+
# email:
12+
# on_success: never
13+
# on_failue: never
14+
# slack: nishida-lab:Sczvu4bdpbngcXGeiZAEdHGx
15+
env:
16+
global:
17+
- CATKIN_PARALLEL_TEST_JOBS=-p1
18+
- ROS_PARALLEL_TEST_JOBS=-j`nproc`
19+
- UPSTREAM_WORKSPACE=file
20+
- ROSINSTALL_FILENAME=.kinetic_depends.rosinstall
21+
matrix:
22+
- ROS_DISTRO=kinetic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
23+
- ROS_DISTRO=kinetic ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
24+
install:
25+
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
26+
script:
27+
- source .ci_config/travis.sh

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# motoman_apps
1+
# motoman_apps [![Build Status](https://travis-ci.org/ntl-ros-pkg/motoman_apps.svg?branch=master)](https://travis-ci.org/ntl-ros-pkg/motoman_apps)

install.sh

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#git clone https://github.com/MoriKen254/ntl_motoman_pkgs.git ../ntl_motoman_pkgs
2+
3+
cd ../../
4+
5+
# install dependent non-apt packages via wstool
6+
wstool init src
7+
wstool merge -t src src/motoman_apps/.kinetic_depends.rosinstall
8+
wstool update -t src
9+
10+
# install dependent apt packages via wstool
11+
rosdep init
12+
rosdep update
13+
rosdep install -i -r -y --from-paths src --ignore-src
14+
15+
# build
16+
catkin_make
17+
source devel/setup.bash
18+
19+
# test
20+
catkin_make run_tests
21+
catkin_test_results
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
- git:
2+
local-name: ntl_motoman_pkgs/motoman_moveit
3+
uri: https://github.com/ntl-ros-pkg/motoman_moveit.git
4+
version: master
5+
- git:
6+
local-name: ntl_motoman_pkgs/motoman_robot
7+
uri: https://github.com/ntl-ros-pkg/motoman_robot.git
8+
version: master
9+
- git:
10+
local-name: ntl_motoman_pkgs/motoman_simulator
11+
uri: https://github.com/ntl-ros-pkg/motoman_simulator.git
12+
version: master

motoman_apps/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
cmake_minimum_required(VERSION 2.8.3)
2+
project(motoman_apps)
3+
find_package(catkin REQUIRED)
4+
catkin_metapackage()

motoman_apps/package.xml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<package format="2">
3+
<name>motoman_apps</name>
4+
<version>0.1.0</version>
5+
<description>The application package for motoman_apps</description>
6+
7+
<maintainer email="[email protected]">Masaru Morita</maintainer>
8+
<license>BSD</license>
9+
10+
<buildtool_depend>catkin</buildtool_depend>
11+
<exec_depend>motoman_moveit_apps</exec_depend>
12+
13+
<export>
14+
<metapackage/>
15+
</export>
16+
</package>

motoman_moveit_apps/CMakeLists.txt

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
cmake_minimum_required(VERSION 2.8.3)
2+
project(motoman_moveit_apps)
3+
4+
find_package(catkin REQUIRED)
5+
6+
catkin_package(
7+
LIBRARIES ${PROJECT_NAME}
8+
)
9+
10+
# Install
11+
foreach(dir launch)
12+
install(DIRECTORY ${dir}/
13+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
14+
endforeach(dir)
15+
16+
# Test
17+
if (CATKIN_ENABLE_TESTING)
18+
find_package(roslaunch REQUIRED)
19+
roslaunch_add_file_check(launch)
20+
endif()
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<launch>
2+
<include file="$(find motoman_gazebo)/launch/sia5/sia5_with_dhand.launch"/>
3+
4+
<include file="$(find timed_roslaunch)/launch/timed_roslaunch.launch">
5+
<arg name="time" value="5" />
6+
<arg name="pkg" value="motoman_moveit_bringup" />
7+
<arg name="file" value="sia5_with_dhand_moveit_planning_execution.launch" />
8+
<!--arg name="node_name" value="sia5_with_dhand_moveit_planning_execution" /-->
9+
</include>
10+
</launch>

motoman_moveit_apps/package.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0"?>
2+
<package format="2">
3+
<name>motoman_moveit_apps</name>
4+
<version>0.1.0</version>
5+
<description>The motoman_moveit_apps package</description>
6+
7+
<maintainer email="[email protected]">MoriKen254</maintainer>
8+
<license>BSD</license>
9+
10+
<url type="repository">http://github.com/ntl-ros-pkg/ntl_motoman_apps</url>
11+
12+
<author email="[email protected]">MoriKen254</author>
13+
14+
<buildtool_depend>catkin</buildtool_depend>
15+
<exec_depend>roslaunch</exec_depend>
16+
<exec_depend>timed_roslaunch</exec_depend>
17+
18+
</package>

0 commit comments

Comments
 (0)