Skip to content

Commit

Permalink
README cleanup and remove ceres source installation refs
Browse files Browse the repository at this point in the history
  • Loading branch information
jdlangs committed Dec 11, 2018
1 parent 828e535 commit 5b2f097
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 18 deletions.
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sudo: required
dist: xenial
language: generic
sudo: required
dist: xenial
language: generic
compiler:
- gcc
notifications:
Expand All @@ -11,12 +11,11 @@ env:
global:
- ROS_DISTRO=kinetic
- UPSTREAM_WORKSPACE=file
- ROSINSTALL_FILENAME=industrial_calibration.rosinstall
- NOT_TEST_INSTALL=true
matrix:
- ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
install:
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
script:
script:
- source .ci_config/travis.sh

28 changes: 16 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,36 @@ Status: [![Build Status](https://travis-ci.org/ros-industrial/industrial_calibra

Contains libraries/algorithms for calibration industrial systems

# Requires
# install ceres-solver(Note, there might be a .deb that works)
# follow instructions on http://ceres-solver.org/installation.html#linux
## Requires

# install openni2
sudo apt-get install ros-kinetic-openni2-camera
sudo apt-get install ros-kinetic-openni2-launch
### Ceres Optimizer

# install moveit
sudo apt-get install ros-kinetic-moveit
- With apt: `sudo apt install libceres-dev`
- With [rosdep](http://docs.ros.org/independent/api/rosdep/html/):
`rosdep install industrial_extrinsic_cal` or
`rosdep install --from-paths industrial_calibration/`

### Openni2
`sudo apt-get install ros-kinetic-openni2-camera`
`sudo apt-get install ros-kinetic-openni2-launch`

### Moveit
`sudo apt-get install ros-kinetic-moveit`

# Examples

## Single Basler on a rail
```
roslaunch robocyl_ical.launch
roslaunch robo_cylinder.launch
rosservice call /RobocylCalService "allowable_cost_per_observation: 0.25"
```

# Build
Requires [wstool](http://wiki.ros.org/wstool)
```
mkdir -p cal_ws/src
cd cal_ws/src
git clone -b kinetic https://github.com/ros-industrial/industrial_calibration.git
wstool merge industrial_calibration/industrial_calibration.rosinstall
wstool update
git clone -b kinetic-devel https://github.com/ros-industrial/industrial_calibration.git
cd ..
catkin build
```
1 change: 0 additions & 1 deletion industrial_calibration.rosinstall

This file was deleted.

0 comments on commit 5b2f097

Please sign in to comment.