Merge pull request #70 from AutonomyLab/sdk_3_10_1

SDK 3.10.1 Support

.travis.yml

@@ -15,11 +15,10 @@ env:
     #- ROS_DISTRO_NAME=kinetic OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
 install:
   # either install the latest released version of ros_buildfarm
-  # (TODO the current release 1.0.1 is not sufficient so for now use the master branch)
-  #- pip install ros_buildfarm
+  - pip install ros_buildfarm
   # or checkout a specific branch
-  - git clone -b master https://github.com/ros-infrastructure/ros_buildfarm /tmp/ros_buildfarm
-  - pip install /tmp/ros_buildfarm
+  # - git clone -b master https://github.com/ros-infrastructure/ros_buildfarm /tmp/ros_buildfarm
+  # - pip install /tmp/ros_buildfarm
   # checkout catkin for catkin_test_results script
   - git clone https://github.com/ros/catkin /tmp/catkin
   # run devel job for a ROS repository with the same name as this repo
@@ -37,4 +36,4 @@ script:
   # get summary of test results
   - /tmp/catkin/bin/catkin_test_results $JOB_PATH/catkin_workspace/test_results --all
 notifications:
-  # email: change
+  # email: change

bebop_driver/CMakeLists.txt

@@ -56,8 +56,8 @@ roslint_cpp(
 ## Build ##
 ###########
 
-# 3.9.1
-set(ARSDK_MANIFEST_HASH 40d5d08ff37a43b0b2deb641cc899d5356163db7)
+# 3.10.1
+set(ARSDK_MANIFEST_HASH 149b0e0fe374c12db48c8beaed167a4a5555a370)
 
 add_custom_target(ARSDK_MKDIR
   COMMAND ${CMAKE_COMMAND} -E make_directory ${CATKIN_DEVEL_PREFIX}/arsdk)

bebop_driver/cfg/autogenerated/BebopArdrone3.cfg

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 # BebopArdrone3.cfg
-# auto-generated from https://raw.githubusercontent.com/Parrot-Developers/libARCommands/7b5cf7a8009278cf634ee33d5c2ed5dd8e573eb4/Xml/ARDrone3_commands.xml
+# auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/d0c8b256a8592b25a551f3ba742c58ae3da2f93a/xml/ardrone3.xml
 # Do not modify this file by hand. Check scripts/meta folder for generator files.
 
 PACKAGE = "bebop_driver"
@@ -12,79 +12,73 @@ gen = ParameterGenerator()
 
 # Piloting Settings commands
 pilotingsettings_group_gen = gen.add_group("pilotingsettings")
-# Set Max Altitude
+# Set max altitude.\n The drone will not fly over this max altitude when it is in manual piloting.\n Please note that if you set a max altitude which is below the current drone altitude, the drone will not go to given max altitude.\n You can get the bounds in the event [MaxAltitude](#1-6-0).
 pilotingsettings_group_gen.add("PilotingSettingsMaxAltitudeCurrent", double_t, 0, "Current altitude max in m", 0 , 0, 160)
-# Set Max Tilt
+# Set max pitch/roll.\n This represent the max inclination allowed by the drone.\n You can get the bounds with the commands [MaxPitchRoll](#1-6-1).
 pilotingsettings_group_gen.add("PilotingSettingsMaxTiltCurrent", double_t, 0, "Current tilt max in degree", 0 , -180.0, 180.0)
-# @deprecated Enable/Disable absolut control
+# Set absolut control.
 PilotingSettingsAbsolutControlOn_enum = gen.enum([
     gen.const("PilotingSettingsAbsolutControlOn_OFF", int_t, 0, "Disabled"),
     gen.const("PilotingSettingsAbsolutControlOn_ON", int_t, 1, "Enabled"),
 ], "1 to enable, 0 to disable")
 pilotingsettings_group_gen.add("PilotingSettingsAbsolutControlOn", int_t, 0, "1 to enable, 0 to disable", 0, 0, 1, edit_method=PilotingSettingsAbsolutControlOn_enum)
-# Set the distance max of the drone
+# Set max distance.\n You can get the bounds from the event [MaxDistance](#1-6-3).\n\n If [Geofence](#1-6-4) is activated, the drone wont fly over the given max distance.
 pilotingsettings_group_gen.add("PilotingSettingsMaxDistanceValue", double_t, 0, "Current max distance in meter", 0 , 0, 160)
-# Indication about how the product handle flying over the max distance limitation
+# Enable geofence.\n If geofence is enabled, the drone wont fly over the given max distance.\n You can get the max distance from the event [MaxDistance](#1-6-3). \n For copters: the distance is computed from the controller position, if this position is not known, it will use the take off.\n For fixed wings: the distance is computed from the take off position.
 PilotingSettingsNoFlyOverMaxDistanceShouldnotflyover_enum = gen.enum([
     gen.const("PilotingSettingsNoFlyOverMaxDistanceShouldnotflyover_OFF", int_t, 0, "Disabled"),
     gen.const("PilotingSettingsNoFlyOverMaxDistanceShouldnotflyover_ON", int_t, 1, "Enabled"),
 ], "1 if the drone cant fly further than max distance, 0 if no limitation on the drone should be done")
 pilotingsettings_group_gen.add("PilotingSettingsNoFlyOverMaxDistanceShouldnotflyover", int_t, 0, "1 if the drone cant fly further than max distance, 0 if no limitation on the drone should be done", 0, 0, 1, edit_method=PilotingSettingsNoFlyOverMaxDistanceShouldnotflyover_enum)
-# Enable / Disable Banked Turn mode.
+# Set banked turn mode.\n When banked turn mode is enabled, the drone will use yaw values from the piloting command to infer with roll and pitch on the drone when its horizontal speed is not null.
 PilotingSettingsBankedTurnValue_enum = gen.enum([
     gen.const("PilotingSettingsBankedTurnValue_OFF", int_t, 0, "Disabled"),
     gen.const("PilotingSettingsBankedTurnValue_ON", int_t, 1, "Enabled"),
 ], "1 to enable, 0 to disable")
 pilotingsettings_group_gen.add("PilotingSettingsBankedTurnValue", int_t, 0, "1 to enable, 0 to disable", 0, 0, 1, edit_method=PilotingSettingsBankedTurnValue_enum)
-# Set Min Altitude
+# Set minimum altitude.\n Only available for fixed wings.
 pilotingsettings_group_gen.add("PilotingSettingsMinAltitudeCurrent", double_t, 0, "Current altitude min in m", 0 , 0, 160)
-# Set Fixed wings circling default direction
+# Set default circling direction. This direction will be used when the drone use an automatic circling or when [CIRCLE](#1-0-9) is sent with direction *default*.\n Only available for fixed wings.
 PilotingSettingsCirclingDirectionValue_enum = gen.enum([
     gen.const("PilotingSettingsCirclingDirectionValue_CW", int_t, 0, "Circling ClockWise"),
     gen.const("PilotingSettingsCirclingDirectionValue_CCW", int_t, 1, "Circling Counter ClockWise"),
 ], "The circling direction")
 pilotingsettings_group_gen.add("PilotingSettingsCirclingDirectionValue", int_t, 0, "The circling direction", 0, 0, 1, edit_method=PilotingSettingsCirclingDirectionValue_enum)
-# Set Fixed wings circling radius
+# Set circling radius.\n Only available for fixed wings.
 pilotingsettings_group_gen.add("PilotingSettingsCirclingRadiusValue", int_t, 0, "The circling radius in meter", 0 , 0, 160)
-# Set Fixed wings circling altitude
+# Set min circling altitude (not used during take off).\n Only available for fixed wings.
 pilotingsettings_group_gen.add("PilotingSettingsCirclingAltitudeValue", int_t, 0, "The circling altitude in meter", 0 , 0, 160)
-# Set pitch mode
+# Set pitch mode.\n Only available for fixed wings.
 PilotingSettingsPitchModeValue_enum = gen.enum([
     gen.const("PilotingSettingsPitchModeValue_NORMAL", int_t, 0, "Positive pitch values will make the drone lower its nose. Negative pitch values will make the drone raise its nose."),
     gen.const("PilotingSettingsPitchModeValue_INVERTED", int_t, 1, "Pitch commands are inverted. Positive pitch values will make the drone raise its nose. Negative pitch values will make the drone lower its nose."),
 ], "The Pitch mode")
 pilotingsettings_group_gen.add("PilotingSettingsPitchModeValue", int_t, 0, "The Pitch mode", 0, 0, 1, edit_method=PilotingSettingsPitchModeValue_enum)
-# Set fixed wings Landing Mode
-PilotingSettingsLandingModeValue_enum = gen.enum([
-    gen.const("PilotingSettingsLandingModeValue_LINEAR", int_t, 0, "Linear landing."),
-    gen.const("PilotingSettingsLandingModeValue_SPIRALE", int_t, 1, "Spirale landing."),
-], "The Landing mode")
-pilotingsettings_group_gen.add("PilotingSettingsLandingModeValue", int_t, 0, "The Landing mode", 0, 0, 1, edit_method=PilotingSettingsLandingModeValue_enum)
 
 # Speed Settings commands
 speedsettings_group_gen = gen.add_group("speedsettings")
-# Set Max Vertical speed
+# Set max vertical speed.
 speedsettings_group_gen.add("SpeedSettingsMaxVerticalSpeedCurrent", double_t, 0, "Current max vertical speed in m/s", 0 , 0.0, 10.0)
-# Set Max Yaw Rotation speed
+# Set max rotation speed.
 speedsettings_group_gen.add("SpeedSettingsMaxRotationSpeedCurrent", double_t, 0, "Current max yaw rotation speed in degree/s", 0 , 0, 900.0)
-# Presence of hull protection
+# Set the presence of hull protection.
 SpeedSettingsHullProtectionPresent_enum = gen.enum([
     gen.const("SpeedSettingsHullProtectionPresent_OFF", int_t, 0, "Disabled"),
     gen.const("SpeedSettingsHullProtectionPresent_ON", int_t, 1, "Enabled"),
 ], "1 if present, 0 if not present")
 speedsettings_group_gen.add("SpeedSettingsHullProtectionPresent", int_t, 0, "1 if present, 0 if not present", 0, 0, 1, edit_method=SpeedSettingsHullProtectionPresent_enum)
-# @deprecated Outdoor property
+# Set outdoor mode.
 SpeedSettingsOutdoorOutdoor_enum = gen.enum([
     gen.const("SpeedSettingsOutdoorOutdoor_OFF", int_t, 0, "Disabled"),
     gen.const("SpeedSettingsOutdoorOutdoor_ON", int_t, 1, "Enabled"),
 ], "1 if outdoor flight, 0 if indoor flight")
 speedsettings_group_gen.add("SpeedSettingsOutdoorOutdoor", int_t, 0, "1 if outdoor flight, 0 if indoor flight", 0, 0, 1, edit_method=SpeedSettingsOutdoorOutdoor_enum)
-# Set Max Pitch/Rool Rotation speed
+# Set max pitch/roll rotation speed.
 speedsettings_group_gen.add("SpeedSettingsMaxPitchRollRotationSpeedCurrent", double_t, 0, "Current max pitch/roll rotation speed in degree/s", 0 , 0, 900.0)
 
 # Network settings commands
 networksettings_group_gen = gen.add_group("networksettings")
-# Auto-select channel of choosen band
+# Select or auto-select channel of choosen band.
 NetworkSettingsWifiSelectionType_enum = gen.enum([
     gen.const("NetworkSettingsWifiSelectionType_auto", int_t, 0, "Auto selection"),
     gen.const("NetworkSettingsWifiSelectionType_manual", int_t, 1, "Manual selection"),
@@ -100,24 +94,43 @@ networksettings_group_gen.add("NetworkSettingsWifiSelectionChannel", int_t, 0, "
 
 # Photo settings chosen by the user
 picturesettings_group_gen = gen.add_group("picturesettings")
-# Set Video stabilization mode
+# Set video stabilization mode.
 PictureSettingsVideoStabilizationModeMode_enum = gen.enum([
     gen.const("PictureSettingsVideoStabilizationModeMode_roll_pitch", int_t, 0, "Video flat on roll and pitch"),
     gen.const("PictureSettingsVideoStabilizationModeMode_pitch", int_t, 1, "Video flat on pitch only"),
     gen.const("PictureSettingsVideoStabilizationModeMode_roll", int_t, 2, "Video flat on roll only"),
     gen.const("PictureSettingsVideoStabilizationModeMode_none", int_t, 3, "Video follows drone angles"),
 ], "Video stabilization mode")
 picturesettings_group_gen.add("PictureSettingsVideoStabilizationModeMode", int_t, 0, "Video stabilization mode", 0, 0, 3, edit_method=PictureSettingsVideoStabilizationModeMode_enum)
+# Set video recording mode.
+PictureSettingsVideoRecordingModeMode_enum = gen.enum([
+    gen.const("PictureSettingsVideoRecordingModeMode_quality", int_t, 0, "Maximize recording quality."),
+    gen.const("PictureSettingsVideoRecordingModeMode_time", int_t, 1, "Maximize recording time."),
+], "Video recording mode")
+picturesettings_group_gen.add("PictureSettingsVideoRecordingModeMode", int_t, 0, "Video recording mode", 0, 0, 1, edit_method=PictureSettingsVideoRecordingModeMode_enum)
+# Set video framerate.
+PictureSettingsVideoFramerateFramerate_enum = gen.enum([
+    gen.const("PictureSettingsVideoFramerateFramerate_24_FPS", int_t, 0, "23.976 frames per second."),
+    gen.const("PictureSettingsVideoFramerateFramerate_25_FPS", int_t, 1, "25 frames per second."),
+    gen.const("PictureSettingsVideoFramerateFramerate_30_FPS", int_t, 2, "29.97 frames per second."),
+], "Video framerate")
+picturesettings_group_gen.add("PictureSettingsVideoFramerateFramerate", int_t, 0, "Video framerate", 0, 0, 2, edit_method=PictureSettingsVideoFramerateFramerate_enum)
+# Set video streaming and recording resolutions.
+PictureSettingsVideoResolutionsType_enum = gen.enum([
+    gen.const("PictureSettingsVideoResolutionsType_rec1080_stream480", int_t, 0, "1080p recording, 480p streaming."),
+    gen.const("PictureSettingsVideoResolutionsType_rec720_stream720", int_t, 1, "720p recording, 720p streaming."),
+], "Video streaming and recording resolutions")
+picturesettings_group_gen.add("PictureSettingsVideoResolutionsType", int_t, 0, "Video streaming and recording resolutions", 0, 0, 1, edit_method=PictureSettingsVideoResolutionsType_enum)
 
 # GPS settings
 gpssettings_group_gen = gen.add_group("gpssettings")
-# Set user preference for the type of the home position. Note that this is only a preference
+# Set the preferred home type.\n Please note that this is only a preference. The actual type chosen is given by the event [HomeType](#1-31-2).\n You can get the currently available types with the event [HomeTypeAvailability](#1-31-1).
 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"),
 ], "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)
-# Set the delay after which the drone will automatically try to return home
+# 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)