Merge pull request PX4#12 from PX4/cessna

WIP: Cessna
msamogh · Nov 30, 2015 · b9b33f7 · b9b33f7
2 parents 1fb483c + a19e3aa
commit b9b33f7
Show file tree

Hide file tree

Showing 17 changed files with 7,289 additions and 11 deletions.
diff --git a/include/gazebo_mavlink_interface.h b/include/gazebo_mavlink_interface.h
@@ -114,6 +114,7 @@ class GazeboMavlinkInterface : public ModelPlugin {
   physics::JointPtr left_elevon_joint_;
   physics::JointPtr right_elevon_joint_;
   physics::JointPtr elevator_joint_;
+  physics::JointPtr propeller_joint_;
 
   /// \brief Pointer to the update event connection.
   event::ConnectionPtr updateConnection_;
@@ -141,6 +142,7 @@ class GazeboMavlinkInterface : public ModelPlugin {
   std::string left_elevon_joint_name_;
   std::string right_elevon_joint_name_;
   std::string elevator_joint_name_;
+  std::string propeller_joint_name_;
 
   common::Time last_time_;
   common::Time last_gps_time_;