Skip to content

Commit

Permalink
Add BSD license option #220
Browse files Browse the repository at this point in the history
  • Loading branch information
vooon committed Mar 4, 2015
1 parent f07ca08 commit 0a24d39
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 44 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ MAVLink extendable communication node for ROS.

- Since 2014-08-11 this repository contains several packages.
- Since 2014-11-02 hydro support splited from master to hydro-devel branch.
- Since 2015-03-04 all packages also dual licensed under terms of BSD license.


mavros package
--------------
Expand Down Expand Up @@ -38,6 +40,7 @@ Please ask your questions not related to bugs/feauture requests on:

We'd like to keep the project bugtracker as free as possible, so please contact via the above methods. You can also PM us via Gitter.


CI Statuses
-----------

Expand Down
54 changes: 12 additions & 42 deletions mavros/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ Only for linux. Depends on [Boost library][boost] >= 1.46 (hydro on 12.04).
Catkin build system required (tested with ROS Hydro Medusa and Indigo Igloo).

This package are dependent on [ros-\*-mavlink][mlwiki] build from [mavlink-gbp-release][mlgbp].
Since 2014-06-19 it exists in hydro and indigo package index (so you can install via rosdep).
Since 2014-06-19 it exists in Hydro and Indigo package index (so you can install via rosdep).
Since 2015-02-25 exists for Jade too.


Connection URL
Expand Down Expand Up @@ -65,7 +66,7 @@ Run example:
rosrun mavros mavros_node _fcu_url:=/dev/ttyACM0:115200 _gcs_url:=tcp-l://


### gcs\_bridge -- additional UDP proxy
### gcs\_bridge -- additional proxy

Allows you to add a channel for GCS.
For example if you need to connect one GCS for HIL and the second on the tablet.
Expand All @@ -77,45 +78,7 @@ Example (HIL & DroidPlanner):
rosrun mavros mavros_node _gcs_url:='udp://:14556@hil-host:14551' &
rosrun mavros gcs_bridge _gcs_url:='udp://@nexus7'


### mavparam -- parameter manipulation

Just see `--help`.

Examples:

rosrun mavros mavparam dump /tmp/apm.param
rosrun mavros mavparam load /tmp/apm2.param


### mavwp -- mission manipulation

See `--help`.

Examples:

rosrun mavros mavwp show -p
rosrun mavros dump /tmp/mission.txt


### mavsafety -- safety tool

See `--help`.

Examples:

rosrun mavros mavsafety arm
rosrun mavros mavsafety disarm


### mavcmd -- commander tool

See `--help`.

Examples:

rosrun mavros mavcmd takeoff 20 15 0 0 50
rosrun mavros mavcmd sethome --current-gps 0 0 0
<!-- scripts moved to ROS wiki -->


Launch Files
Expand All @@ -139,6 +102,7 @@ Installation
### Binary installation (debian)

Since v0.5 that programs available in precompiled debian packages for x86 and amd64 (x86\_64).
Also v0.9+ exists in ARMv7 repo for Ubuntu armhf.
Just use `apt-get` for installation:

sudo apt-get install ros-indigo-mavros ros-indigo-mavros-extras
Expand All @@ -148,7 +112,7 @@ Just use `apt-get` for installation:

Use `wstool` utility for installation. In your workspace do:

wstool init src (if not already initialized)
wstool init src # (if not already initialized)
wstool set -t src mavros --git https://github.com/mavlink/mavros.git
wstool update -t src
rosdep install --from-paths src --ignore-src --rosdistro indigo -y
Expand Down Expand Up @@ -184,6 +148,12 @@ $ROSINSTALL must be writable for user or you can add `sudo -s` to last command.
Or you could build debian package by pulling right bloom branch from [mavlink-gbp-release][mlgbp]
(common naming: `debian/<rosdistro>/<osdistro>/<package>`) using `dh binary`.

cd /tmp
git clone https://github.com/mavlink/mavlink-gbp-release.git -b debian/indigo/trusty/mavlink
cd mavlink-gbp-release
fakeroot dh binary
# deb will be in /tmp


Contributing
------------
Expand Down
1 change: 1 addition & 0 deletions mavros/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<maintainer email="vooon341@gmail.com">Vladimir Ermakov</maintainer>
<author email="vooon341@gmail.com">Vladimir Ermakov</author>
<license>GPLv3</license>
<license>BSD</license>

<url type="website">http://wiki.ros.org/mavros</url>
<url type="repository">https://github.com/mavlink/mavros.git</url>
Expand Down
8 changes: 6 additions & 2 deletions mavros_extras/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Some extra plugins and nodes for [mavros][mr].
px4flow
-------

Plugin for mavros. Publish `OPTICAL_FLOW` data.
Plugin for mavros. Publish `OPTICAL_FLOW_RAD` data.


image\_pub
Expand All @@ -21,9 +21,13 @@ gcs\_image\_bridge

Variation of `gcs_bridge` that additionally sends image stream to GCS.


mocap\_pose\_estimate
----------------------
Plugin for mavros, to send mocap data to FCU. Currently, not used by the FCU. Data can be send via vision_position plugin.

Plugin for mavros, to send mocap data to FCU. Currently, not used by the FCU.
Data can be send via `vision_position` plugin.


px-ros-pkg replacement
----------------------
Expand Down
1 change: 1 addition & 0 deletions mavros_extras/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<maintainer email="vooon341@gmail.com">Vladimir Ermakov</maintainer>
<author email="vooon341@gmail.com">Vladimir Ermakov</author>
<license>GPLv3</license>
<license>BSD</license>

<url type="website">http://wiki.ros.org/mavros_extras</url>
<url type="repository">https://github.com/mavlink/mavros.git</url>
Expand Down

0 comments on commit 0a24d39

Please sign in to comment.