Skip to content

Commit

Permalink
Add support for SDK 3.11 (#99)
Browse files Browse the repository at this point in the history
* Add support for SDK 3.11.0

	- SDK 3.11.0 Changelog: AutonomyLab/parrot_arsdk#4

	- New topics and types:

	    states/enable_camerastate_orientationv2 				bebop_msgs/msg/autogenerated/Ardrone3CameraStateOrientationV2.msg
	    states/enable_camerastate_velocityrange 				bebop_msgs/msg/autogenerated/Ardrone3CameraStateVelocityRange.msg
	    states/enable_camerastate_defaultcameraorientationv2 	bebop_msgs/msg/autogenerated/Ardrone3CameraStatedefaultCameraOrientationV2.msg
	    states/enable_pilotingstate_airspeedchanged 			bebop_msgs/msg/autogenerated/Ardrone3PilotingStateAirSpeedChanged.msg
	    states/enable_commonstate_videorecordingtimestamp 		bebop_msgs/msg/autogenerated/CommonCommonStateVideoRecordingTimestamp.msg
	    states/enable_mavlinkstate_missonitemexecuted 			bebop_msgs/msg/autogenerated/CommonMavlinkStateMissonItemExecuted.msg

	- New type for **Return Home**: `GPSSettingsHomeTypeType_FOLLOWEE`
	- New Flying State: `state_emergency_landing`

* Add explicit version dependency to parrot_arsdk 3.11.0
* Update parrot_arsdk's version in the README file
* Remove ROS Jade builds from CI
  • Loading branch information
mani-monaj authored Mar 1, 2017
1 parent a478231 commit 4368d1c
Show file tree
Hide file tree
Showing 31 changed files with 638 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
- JOB_PATH=/tmp/devel_job
matrix:
- ROS_DISTRO_NAME=indigo OS_NAME=ubuntu OS_CODE_NAME=trusty ARCH=amd64
- ROS_DISTRO_NAME=jade OS_NAME=ubuntu OS_CODE_NAME=trusty ARCH=amd64
# - ROS_DISTRO_NAME=jade OS_NAME=ubuntu OS_CODE_NAME=trusty ARCH=amd64
- ROS_DISTRO_NAME=kinetic OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
install:
# either install the latest released version of ros_buildfarm
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@

[![Build Status (ROS I,J,K) - TravisCI](https://travis-ci.org/AutonomyLab/bebop_autonomy.svg?branch=indigo-devel)](https://travis-ci.org/AutonomyLab/bebop_autonomy) [![Build Status (ROS I,J) - Semaphore](https://semaphoreci.com/api/v1/projects/11786233-d505-4d79-b27c-80c2742243a4/537552/badge.svg)](https://semaphoreci.com/mani_monaj/bebop_autonomy)

Built against [parrot_arsdk](https://github.com/AutonomyLab/parrot_arsdk) 3.10.1
Built against [parrot_arsdk](https://github.com/AutonomyLab/parrot_arsdk) 3.11.0
5 changes: 3 additions & 2 deletions bebop_driver/cfg/autogenerated/BebopArdrone3.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

# BebopArdrone3.cfg
# auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/d0c8b256a8592b25a551f3ba742c58ae3da2f93a/xml/ardrone3.xml
# auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/e73425074471c58561d04c85da4a6400b638779d/xml/ardrone3.xml
# Do not modify this file by hand. Check scripts/meta folder for generator files.

PACKAGE = "bebop_driver"
Expand Down Expand Up @@ -128,8 +128,9 @@ gpssettings_group_gen = gen.add_group("gpssettings")
GPSSettingsHomeTypeType_enum = gen.enum([
gen.const("GPSSettingsHomeTypeType_TAKEOFF", int_t, 0, "The drone will try to return to the take off position"),
gen.const("GPSSettingsHomeTypeType_PILOT", int_t, 1, "The drone will try to return to the pilot position"),
gen.const("GPSSettingsHomeTypeType_FOLLOWEE", int_t, 2, "The drone will try to return to the target of the current (or last) follow me"),
], "The type of the home position")
gpssettings_group_gen.add("GPSSettingsHomeTypeType", int_t, 0, "The type of the home position", 0, 0, 1, edit_method=GPSSettingsHomeTypeType_enum)
gpssettings_group_gen.add("GPSSettingsHomeTypeType", int_t, 0, "The type of the home position", 0, 0, 2, edit_method=GPSSettingsHomeTypeType_enum)
# Set the delay after which the drone will automatically try to return home after a disconnection.
gpssettings_group_gen.add("GPSSettingsReturnHomeDelayDelay", int_t, 0, "Delay in second", 0 , 0, 120)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCL
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Ardrone3_setting_callback_includes.h
* auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/d0c8b256a8592b25a551f3ba742c58ae3da2f93a/xml/ardrone3.xml
* auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/e73425074471c58561d04c85da4a6400b638779d/xml/ardrone3.xml
* Do not modify this file by hand. Check scripts/meta folder for generator files.
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCL
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Ardrone3_setting_callbacks.h
* auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/d0c8b256a8592b25a551f3ba742c58ae3da2f93a/xml/ardrone3.xml
* auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/e73425074471c58561d04c85da4a6400b638779d/xml/ardrone3.xml
* Do not modify this file by hand. Check scripts/meta folder for generator files.
*/
#ifndef BEBOP_AUTONOMY_AUTOGENERATED_Ardrone3_SETTING_CALLBACKS_H
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCL
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ardrone3_state_callback_includes.h
* auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/d0c8b256a8592b25a551f3ba742c58ae3da2f93a/xml/ardrone3.xml
* auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/e73425074471c58561d04c85da4a6400b638779d/xml/ardrone3.xml
* Do not modify this file by hand. Check scripts/meta folder for generator files.
*/

Expand All @@ -46,6 +46,7 @@ namespace cb
class Ardrone3PilotingStateAltitudeChanged;
class Ardrone3PilotingStateGpsLocationChanged;
class Ardrone3PilotingStateLandingStateChanged;
class Ardrone3PilotingStateAirSpeedChanged;
class Ardrone3NetworkStateWifiScanListChanged;
class Ardrone3NetworkStateAllWifiScanChanged;
class Ardrone3NetworkStateWifiAuthChannelListChanged;
Expand All @@ -54,6 +55,9 @@ namespace cb
class Ardrone3MediaStreamingStateVideoStreamModeChanged;
class Ardrone3CameraStateOrientation;
class Ardrone3CameraStatedefaultCameraOrientation;
class Ardrone3CameraStateOrientationV2;
class Ardrone3CameraStatedefaultCameraOrientationV2;
class Ardrone3CameraStateVelocityRange;
class Ardrone3AntiflickeringStateelectricFrequencyChanged;
class Ardrone3AntiflickeringStatemodeChanged;
class Ardrone3GPSStateNumberOfSatelliteChanged;
Expand Down Expand Up @@ -97,6 +101,8 @@ boost::shared_ptr<cb::Ardrone3PilotingStateGpsLocationChanged>
ardrone3_pilotingstate_gpslocationchanged_ptr;
boost::shared_ptr<cb::Ardrone3PilotingStateLandingStateChanged>
ardrone3_pilotingstate_landingstatechanged_ptr;
boost::shared_ptr<cb::Ardrone3PilotingStateAirSpeedChanged>
ardrone3_pilotingstate_airspeedchanged_ptr;
boost::shared_ptr<cb::Ardrone3NetworkStateWifiScanListChanged>
ardrone3_networkstate_wifiscanlistchanged_ptr;
boost::shared_ptr<cb::Ardrone3NetworkStateAllWifiScanChanged>
Expand All @@ -113,6 +119,12 @@ boost::shared_ptr<cb::Ardrone3CameraStateOrientation>
ardrone3_camerastate_orientation_ptr;
boost::shared_ptr<cb::Ardrone3CameraStatedefaultCameraOrientation>
ardrone3_camerastate_defaultcameraorientation_ptr;
boost::shared_ptr<cb::Ardrone3CameraStateOrientationV2>
ardrone3_camerastate_orientationv2_ptr;
boost::shared_ptr<cb::Ardrone3CameraStatedefaultCameraOrientationV2>
ardrone3_camerastate_defaultcameraorientationv2_ptr;
boost::shared_ptr<cb::Ardrone3CameraStateVelocityRange>
ardrone3_camerastate_velocityrange_ptr;
boost::shared_ptr<cb::Ardrone3AntiflickeringStateelectricFrequencyChanged>
ardrone3_antiflickeringstate_electricfrequencychanged_ptr;
boost::shared_ptr<cb::Ardrone3AntiflickeringStatemodeChanged>
Expand Down Expand Up @@ -177,6 +189,9 @@ ardrone3_pilotingstate_gpslocationchanged_ptr.reset(
ardrone3_pilotingstate_landingstatechanged_ptr.reset(
new cb::Ardrone3PilotingStateLandingStateChanged(
nh, priv_nh, "states/ardrone3/PilotingState/LandingStateChanged"));
ardrone3_pilotingstate_airspeedchanged_ptr.reset(
new cb::Ardrone3PilotingStateAirSpeedChanged(
nh, priv_nh, "states/ardrone3/PilotingState/AirSpeedChanged"));
ardrone3_networkstate_wifiscanlistchanged_ptr.reset(
new cb::Ardrone3NetworkStateWifiScanListChanged(
nh, priv_nh, "states/ardrone3/NetworkState/WifiScanListChanged"));
Expand All @@ -201,6 +216,15 @@ ardrone3_camerastate_orientation_ptr.reset(
ardrone3_camerastate_defaultcameraorientation_ptr.reset(
new cb::Ardrone3CameraStatedefaultCameraOrientation(
nh, priv_nh, "states/ardrone3/CameraState/defaultCameraOrientation"));
ardrone3_camerastate_orientationv2_ptr.reset(
new cb::Ardrone3CameraStateOrientationV2(
nh, priv_nh, "states/ardrone3/CameraState/OrientationV2"));
ardrone3_camerastate_defaultcameraorientationv2_ptr.reset(
new cb::Ardrone3CameraStatedefaultCameraOrientationV2(
nh, priv_nh, "states/ardrone3/CameraState/defaultCameraOrientationV2"));
ardrone3_camerastate_velocityrange_ptr.reset(
new cb::Ardrone3CameraStateVelocityRange(
nh, priv_nh, "states/ardrone3/CameraState/VelocityRange"));
ardrone3_antiflickeringstate_electricfrequencychanged_ptr.reset(
new cb::Ardrone3AntiflickeringStateelectricFrequencyChanged(
nh, priv_nh, "states/ardrone3/AntiflickeringState/electricFrequencyChanged"));
Expand Down Expand Up @@ -285,6 +309,10 @@ callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<c
ardrone3_pilotingstate_landingstatechanged_ptr->GetCommandKey(),
ardrone3_pilotingstate_landingstatechanged_ptr));
// Add all wrappers to the callback map
callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
ardrone3_pilotingstate_airspeedchanged_ptr->GetCommandKey(),
ardrone3_pilotingstate_airspeedchanged_ptr));
// Add all wrappers to the callback map
callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
ardrone3_networkstate_wifiscanlistchanged_ptr->GetCommandKey(),
ardrone3_networkstate_wifiscanlistchanged_ptr));
Expand Down Expand Up @@ -317,6 +345,18 @@ callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<c
ardrone3_camerastate_defaultcameraorientation_ptr->GetCommandKey(),
ardrone3_camerastate_defaultcameraorientation_ptr));
// Add all wrappers to the callback map
callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
ardrone3_camerastate_orientationv2_ptr->GetCommandKey(),
ardrone3_camerastate_orientationv2_ptr));
// Add all wrappers to the callback map
callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
ardrone3_camerastate_defaultcameraorientationv2_ptr->GetCommandKey(),
ardrone3_camerastate_defaultcameraorientationv2_ptr));
// Add all wrappers to the callback map
callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
ardrone3_camerastate_velocityrange_ptr->GetCommandKey(),
ardrone3_camerastate_velocityrange_ptr));
// Add all wrappers to the callback map
callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
ardrone3_antiflickeringstate_electricfrequencychanged_ptr->GetCommandKey(),
ardrone3_antiflickeringstate_electricfrequencychanged_ptr));
Expand Down
Loading

0 comments on commit 4368d1c

Please sign in to comment.