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

Use ceres binary dependency #137

Merged
merged 2 commits into from
Dec 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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

26 changes: 16 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,38 @@ 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
### Ceres Optimizer

- 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
```

# install moveit
sudo apt-get install ros-kinetic-moveit
### 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.

2 changes: 1 addition & 1 deletion industrial_extrinsic_cal/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<depend>tf</depend>
<depend>tf_conversions</depend>
<depend>yaml-cpp</depend>
<depend>ceres-solver</depend>
<depend>libceres-dev</depend>

<build_depend>boost</build_depend>
<build_depend>message_generation</build_depend>
Expand Down
2 changes: 1 addition & 1 deletion intrinsic_cal/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<depend>roslib</depend>
<depend>std_msgs</depend>
<depend>std_srvs</depend>
<depend>ceres-solver</depend>
<depend>libceres-dev</depend>

<build_depend>message_generation</build_depend>
<build_depend>robo_cylinder</build_depend>
Expand Down
2 changes: 1 addition & 1 deletion rgbd_depth_correction/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<depend>tf_conversions</depend>
<depend>target_finder</depend>
<depend>yaml-cpp</depend>
<depend>ceres-solver</depend>
<depend>libceres-dev</depend>

<exec_depend>image_view</exec_depend>
<exec_depend>joint_state_publisher</exec_depend>
Expand Down
2 changes: 1 addition & 1 deletion target_finder/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<depend>std_msgs</depend>
<depend>std_srvs</depend>
<depend>tf</depend>
<depend>ceres-solver</depend>
<depend>libceres-dev</depend>

<build_depend>boost</build_depend>
<build_depend>message_generation</build_depend>
Expand Down