Skip to content

Commit

Permalink
Merge branch 'dev/newRelease'
Browse files Browse the repository at this point in the history
  • Loading branch information
gsilano committed Dec 27, 2019
2 parents f1f0c2b + d018c8b commit 15b5bf9
Show file tree
Hide file tree
Showing 5 changed files with 180 additions and 110 deletions.
49 changes: 29 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# `wstool`, and should be listed in a file named dependencies.rosinstall.
#
# There are two variables you may want to change:
# - ROS_DISTRO (default is indigo, but also kinetic is now compatible). Note that
# - ROS_DISTRO (default is indigo, but also kinetic is now compatible). Note that
# packages must be available for ubuntu 14.04 trusty and xenial 16.04, respectively.
#
# See the README.md for more information.
Expand All @@ -41,10 +41,18 @@

################################################################################

# Use ubuntu xenial (16.04) with sudo privileges.
os: linux
dist: xenial
sudo: required

# Use ubuntu xenial (16.04) and bionic (18.04) with sudo privileges.
matrix:
include:
- os: linux
dist: xenial
sudo: required
env: ROS_DISTRO=kinetic
- os: linux
dist: bionic
sudo: required
env: ROS_DISTRO=melodic

language:
- generic
Expand All @@ -55,7 +63,6 @@ cache:
# trigger a build matrix for different ROS distributions if desired.
env:
global:
- ROS_DISTRO=kinetic
- ROS_CI_DESKTOP="`lsb_release -cs`" # e.g. [precise|trusty|...]
- CI_SOURCE_PATH=$(pwd)
- ROSINSTALL_FILE=$CI_SOURCE_PATH/dependencies.rosinstall
Expand All @@ -71,17 +78,17 @@ env:
before_install:
- sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $ROS_CI_DESKTOP main" > /etc/apt/sources.list.d/ros-latest.list'
- wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
- sudo rm /var/lib/dpkg/lock
- sudo dpkg --configure -a
- if [[ "$ROS_DISTRO" == "kinetic" ]]; then sudo rm /var/lib/dpkg/lock; fi
- if [[ "$ROS_DISTRO" == "kinetic" ]]; then sudo dpkg --configure -a; fi
- sudo apt-get update
- sudo apt-get install ros-$ROS_DISTRO-desktop-full ros-$ROS_DISTRO-joy ros-$ROS_DISTRO-octomap-ros
- sudo apt-get install python-wstool python-catkin-tools
- sudo apt-get install protobuf-compiler libgoogle-glog-dev
# Prepare rosdep to install dependencies.
- sudo rosdep init
- sudo apt-get install ros-$ROS_DISTRO-desktop-full ros-$ROS_DISTRO-joy ros-$ROS_DISTRO-octomap-ros ros-$ROS_DISTRO-mavlink
- sudo apt-get install python-wstool python-catkin-tools python-rosinstall build-essential
- sudo apt-get install protobuf-compiler libgoogle-glog-dev python-rosinstall-generator
# Prepare rosdep to install dependencies.
- sudo rosdep init
- rosdep update
- source /opt/ros/$ROS_DISTRO/setup.bash

# Create a catkin workspace with the package under integration.
install:
- mkdir -p ~/catkin_ws/src
Expand All @@ -93,13 +100,15 @@ install:
- git clone https://github.com/gsilano/BebopS.git
- git clone https://github.com/gsilano/rotors_simulator.git
- git clone https://github.com/gsilano/mav_comm.git
- git clone https://github.com/gsilano/med_aerial_challenge_launch.git
- git clone https://github.com/gsilano/bebop_autonomy.git
- cd ~/catkin_ws/src/rotors_simulator
- git checkout med18
- cd ~/catkin_ws/src/mav_comm
- git checkout med18
- rosdep update
- cd ~/catkin_ws/src/rotors_simulator
- if [[ "$ROS_DISTRO" == "kinetic" ]]; then git checkout med18; fi
- if [[ "$ROS_DISTRO" == "melodic" ]]; then git checkout med18_gazebo9; fi
- cd ~/catkin_ws/src/mav_comm
- if [[ "$ROS_DISTRO" == "kinetic" ]]; then git checkout med18; fi
- if [[ "$ROS_DISTRO" == "melodic" ]]; then git checkout med18_gazebo9; fi
- cd ~/catkin_ws/src/BebopS
- if [[ "$ROS_DISTRO" == "melodic" ]]; then git checkout dev/gazebo9; fi
- cd ~/catkin_ws
- rosdep install --from-paths src -i
- catkin build
Expand Down
13 changes: 11 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,19 @@
Changelog for package BebopS
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.0.1 (2019-12-26)
------------------
* Updated the README.md file with instructions for Ubuntu 18.04, ROS Melodic Morenia and Gazebo 9 (master)
* Deleted the README.md file to avoid misunderstanding in the installation procedure (dev/gazebo9 branch)
* Inserted the default RotorS IMU (ADIS16448 IMU) in the list of the available sensors when running the simulation
* Disable shadows in Gazebo 9 and added the rotors_interface_plugin. The plugin is necessary for reading the sensors messages
* Deleted TravisCI (.travisci.yml) file. Only one file is present in the master. The file handles all the distro.
* Contributors: Giuseppe Silano

0.2.2 (2019-12-26)
------------------
* Inserted the default RotorS IMU (ADIS16448 IMU) in the list of the available sensors when running the simulation
* Disabled shadows in Gazebo 9
* Contributors: Giuseppe Silano

0.2.1 (2019-04-04)
Expand Down Expand Up @@ -42,7 +52,7 @@ Changelog for package BebopS
* Added the Kalman filter
* Added plots in the launch file to monitor the position and linear velocity errors between the Kalman filter output and the odometry ground truth values. In order to develop such functionality, the teamsannio messages have been created.
* A yaml file needed to set up the Kalman filter has been created. Such file contains the tuning matrix of the filter and the standard deviations that characterize the odometry virtual sensor.
* The Kalman filter works with the noisy attitude (standard deviation 0.017). This function considers the nonideality of the attitude filter onboard the quadrotor.
* The Kalman filter works with the noisy attitude (standard deviation 0.017). This function considers the nonideality of the attitude filter onboard the quadrotor.
* Contributors: Pasquale Oppido, Giuseppe Silano, Luigi Iannelli

0.1.3 (2018-05-25)
Expand All @@ -68,4 +78,3 @@ Changelog for package BebopS
------------------
* Initial Ubuntu package release
* Contributors: Giuseppe Silano, Pasquale Oppido, Luigi Iannelli

Loading

0 comments on commit 15b5bf9

Please sign in to comment.