Update to SDK 3.14.0 and added support for Disco

README.md

@@ -19,4 +19,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.12.6p1
+Built against [parrot_arsdk](https://github.com/AutonomyLab/parrot_arsdk) 3.14.0p1

bebop_autonomy/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package bebop_autonomy
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.8.0 (2018-07-03)
+------------------
+
 0.7.0 (2017-07-29)
 ------------------
 

bebop_autonomy/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>bebop_autonomy</name>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
   <description>bebop_autonomy is a ROS driver for Parrot Bebop drone, based on Parrot’s official ARDroneSDK3</description>
 
   <maintainer email="[email protected]">Mani Monajjemi</maintainer>

bebop_description/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package bebop_description
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.8.0 (2018-07-03)
+------------------
+
 0.7.0 (2017-07-29)
 ------------------
 

bebop_description/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>bebop_description</name>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
   <description>URDF robot description for Parrot Bebop Drones</description>
 
   <maintainer email="[email protected]">Mani Monajjemi</maintainer>

bebop_driver/CHANGELOG.rst

@@ -2,6 +2,18 @@
 Changelog for package bebop_driver
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.8.0 (2018-07-03)
+------------------
+* SDK 3.14.0 support
+* Add support for Disco
+* Add a new ROS topic for entering and exiting user takeoff mode: `user_takeoff`
+* Contributors: Thomas Bamford
+
+0.7.1 (2018-05-31)
+------------------
+* Fixed the bug appearing when you run the catkin build command
+* Contributors: Giuseppe Silano
+
 0.7.0 (2017-07-29)
 ------------------
 * SDK 3.12.6 support (except 64bit Ubuntu Xenial, working on fix)

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/arsdk-xml/ab28dab91845cd36c4d7002b55f70805deaff3c8/xml/ardrone3.xml
+# auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/6faa46898d94fa207fd1b039643d356d14b7db42/xml/ardrone3.xml
 # Do not modify this file by hand. Check scripts/meta folder for generator files.
 
 PACKAGE = "bebop_driver"

bebop_driver/include/bebop_driver/autogenerated/ardrone3_setting_callback_includes.h

@@ -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/ab28dab91845cd36c4d7002b55f70805deaff3c8/xml/ardrone3.xml
+ * auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/6faa46898d94fa207fd1b039643d356d14b7db42/xml/ardrone3.xml
  * Do not modify this file by hand. Check scripts/meta folder for generator files.
  */
 

bebop_driver/include/bebop_driver/autogenerated/ardrone3_setting_callbacks.h

@@ -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/ab28dab91845cd36c4d7002b55f70805deaff3c8/xml/ardrone3.xml
+ * auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/6faa46898d94fa207fd1b039643d356d14b7db42/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

bebop_driver/include/bebop_driver/autogenerated/ardrone3_state_callback_includes.h

@@ -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/ab28dab91845cd36c4d7002b55f70805deaff3c8/xml/ardrone3.xml
+ * auto-generated from https://raw.githubusercontent.com/Parrot-Developers/arsdk-xml/6faa46898d94fa207fd1b039643d356d14b7db42/xml/ardrone3.xml
  * Do not modify this file by hand. Check scripts/meta folder for generator files.
  */
 
@@ -48,6 +48,9 @@ namespace cb
   class Ardrone3PilotingStateLandingStateChanged;
   class Ardrone3PilotingStateAirSpeedChanged;
   class Ardrone3PilotingStatemoveToChanged;
+  class Ardrone3PilotingStateMotionState;
+  class Ardrone3PilotingStatePilotedPOI;
+  class Ardrone3PilotingStateReturnHomeBatteryCapacity;
   class Ardrone3NetworkStateWifiScanListChanged;
   class Ardrone3NetworkStateAllWifiScanChanged;
   class Ardrone3NetworkStateWifiAuthChannelListChanged;
@@ -66,6 +69,8 @@ namespace cb
   class Ardrone3GPSStateHomeTypeChosenChanged;
   class Ardrone3PROStateFeatures;
   class Ardrone3AccessoryStateConnectedAccessories;
+  class Ardrone3AccessoryStateBattery;
+  class Ardrone3SoundStateAlertSound;
 }  // namespace cb
 #endif  // FORWARD_DECLARATIONS
 
@@ -107,6 +112,12 @@ boost::shared_ptr<cb::Ardrone3PilotingStateAirSpeedChanged>
   ardrone3_pilotingstate_airspeedchanged_ptr;
 boost::shared_ptr<cb::Ardrone3PilotingStatemoveToChanged>
   ardrone3_pilotingstate_movetochanged_ptr;
+boost::shared_ptr<cb::Ardrone3PilotingStateMotionState>
+  ardrone3_pilotingstate_motionstate_ptr;
+boost::shared_ptr<cb::Ardrone3PilotingStatePilotedPOI>
+  ardrone3_pilotingstate_pilotedpoi_ptr;
+boost::shared_ptr<cb::Ardrone3PilotingStateReturnHomeBatteryCapacity>
+  ardrone3_pilotingstate_returnhomebatterycapacity_ptr;
 boost::shared_ptr<cb::Ardrone3NetworkStateWifiScanListChanged>
   ardrone3_networkstate_wifiscanlistchanged_ptr;
 boost::shared_ptr<cb::Ardrone3NetworkStateAllWifiScanChanged>
@@ -143,6 +154,10 @@ boost::shared_ptr<cb::Ardrone3PROStateFeatures>
   ardrone3_prostate_features_ptr;
 boost::shared_ptr<cb::Ardrone3AccessoryStateConnectedAccessories>
   ardrone3_accessorystate_connectedaccessories_ptr;
+boost::shared_ptr<cb::Ardrone3AccessoryStateBattery>
+  ardrone3_accessorystate_battery_ptr;
+boost::shared_ptr<cb::Ardrone3SoundStateAlertSound>
+  ardrone3_soundstate_alertsound_ptr;
 #endif  // DEFINE_SHARED_PTRS
 
 #ifdef UPDTAE_CALLBACK_MAP
@@ -201,6 +216,15 @@ ardrone3_pilotingstate_airspeedchanged_ptr.reset(
 ardrone3_pilotingstate_movetochanged_ptr.reset(
   new cb::Ardrone3PilotingStatemoveToChanged(
     nh, priv_nh, "states/ardrone3/PilotingState/moveToChanged"));
+ardrone3_pilotingstate_motionstate_ptr.reset(
+  new cb::Ardrone3PilotingStateMotionState(
+    nh, priv_nh, "states/ardrone3/PilotingState/MotionState"));
+ardrone3_pilotingstate_pilotedpoi_ptr.reset(
+  new cb::Ardrone3PilotingStatePilotedPOI(
+    nh, priv_nh, "states/ardrone3/PilotingState/PilotedPOI"));
+ardrone3_pilotingstate_returnhomebatterycapacity_ptr.reset(
+  new cb::Ardrone3PilotingStateReturnHomeBatteryCapacity(
+    nh, priv_nh, "states/ardrone3/PilotingState/ReturnHomeBatteryCapacity"));
 ardrone3_networkstate_wifiscanlistchanged_ptr.reset(
   new cb::Ardrone3NetworkStateWifiScanListChanged(
     nh, priv_nh, "states/ardrone3/NetworkState/WifiScanListChanged"));
@@ -255,6 +279,12 @@ ardrone3_prostate_features_ptr.reset(
 ardrone3_accessorystate_connectedaccessories_ptr.reset(
   new cb::Ardrone3AccessoryStateConnectedAccessories(
     nh, priv_nh, "states/ardrone3/AccessoryState/ConnectedAccessories"));
+ardrone3_accessorystate_battery_ptr.reset(
+  new cb::Ardrone3AccessoryStateBattery(
+    nh, priv_nh, "states/ardrone3/AccessoryState/Battery"));
+ardrone3_soundstate_alertsound_ptr.reset(
+  new cb::Ardrone3SoundStateAlertSound(
+    nh, priv_nh, "states/ardrone3/SoundState/AlertSound"));
 
 // Add all wrappers to the callback map
 callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
@@ -329,6 +359,18 @@ callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<c
                       ardrone3_pilotingstate_movetochanged_ptr->GetCommandKey(),
                       ardrone3_pilotingstate_movetochanged_ptr));
 // Add all wrappers to the callback map
+callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
+                      ardrone3_pilotingstate_motionstate_ptr->GetCommandKey(),
+                      ardrone3_pilotingstate_motionstate_ptr));
+// Add all wrappers to the callback map
+callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
+                      ardrone3_pilotingstate_pilotedpoi_ptr->GetCommandKey(),
+                      ardrone3_pilotingstate_pilotedpoi_ptr));
+// Add all wrappers to the callback map
+callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
+                      ardrone3_pilotingstate_returnhomebatterycapacity_ptr->GetCommandKey(),
+                      ardrone3_pilotingstate_returnhomebatterycapacity_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));
@@ -400,4 +442,12 @@ callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<c
 callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
                       ardrone3_accessorystate_connectedaccessories_ptr->GetCommandKey(),
                       ardrone3_accessorystate_connectedaccessories_ptr));
+// Add all wrappers to the callback map
+callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
+                      ardrone3_accessorystate_battery_ptr->GetCommandKey(),
+                      ardrone3_accessorystate_battery_ptr));
+// Add all wrappers to the callback map
+callback_map_.insert(std::pair<eARCONTROLLER_DICTIONARY_KEY, boost::shared_ptr<cb::AbstractCommand> >(
+                      ardrone3_soundstate_alertsound_ptr->GetCommandKey(),
+                      ardrone3_soundstate_alertsound_ptr));
 #endif  // UPDTAE_CALLBACK_MAP