diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 12:08:39 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 12:11:05 +0100 |
| commit | 16618f1adac7f33817fb968b285288beb360b012 (patch) | |
| tree | b6181cbd01cb923023810b735c4bc6cb40c58b8e /src/modules/mc_att_control/mc_att_control.h | |
| parent | 4402d7106bc63b2a02a1e4c22f54e072b3c48fc7 (diff) | |
| parent | 6e874bed50d6d8a13a3b7f9b883697cb2718d27b (diff) | |
| download | px4-firmware-16618f1adac7f33817fb968b285288beb360b012.tar.gz px4-firmware-16618f1adac7f33817fb968b285288beb360b012.tar.bz2 px4-firmware-16618f1adac7f33817fb968b285288beb360b012.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
src/examples/subscriber/subscriber_params.c
src/modules/mc_att_control/mc_att_control_main.cpp
src/modules/uORB/topics/vehicle_attitude.h
src/modules/uORB/topics/vehicle_attitude_setpoint.h
src/platforms/px4_middleware.h
Diffstat (limited to 'src/modules/mc_att_control/mc_att_control.h')
| -rw-r--r-- | src/modules/mc_att_control/mc_att_control.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/mc_att_control/mc_att_control.h b/src/modules/mc_att_control/mc_att_control.h index 76c095cc1..33552c269 100644 --- a/src/modules/mc_att_control/mc_att_control.h +++ b/src/modules/mc_att_control/mc_att_control.h @@ -93,6 +93,8 @@ private: px4::Publisher * _v_rates_sp_pub; /**< rate setpoint publication */ px4::Publisher * _actuators_0_pub; /**< attitude actuator controls publication */ + bool _is_vtol; /**< true if vehicle is vtol, to be replaced with global API */ + px4::NodeHandle _n; struct { @@ -117,6 +119,8 @@ private: px4_param_t acro_roll_max; px4_param_t acro_pitch_max; px4_param_t acro_yaw_max; + + px4_param_t autostart_id; } _params_handles; /**< handles for interesting parameters */ perf_counter_t _loop_perf; /**< loop performance counter */ |