aboutsummaryrefslogtreecommitdiff
path: root/src/modules/ekf_att_pos_estimator/AttitudePositionEstimatorEKF.h
diff options
context:
space:
mode:
authorJohan Jansen <jnsn.johan@gmail.com>2015-02-13 10:50:55 +0100
committerJohan Jansen <jnsn.johan@gmail.com>2015-02-13 10:50:55 +0100
commit331352c75d337e3190cedb5d53159cd63504223a (patch)
treeccc849f4aa5e4643b6d9bef00182e622bf6568a2 /src/modules/ekf_att_pos_estimator/AttitudePositionEstimatorEKF.h
parent6af2a38f3621afb57ec33e4298e4399fb567e25a (diff)
downloadpx4-firmware-331352c75d337e3190cedb5d53159cd63504223a.tar.gz
px4-firmware-331352c75d337e3190cedb5d53159cd63504223a.tar.bz2
px4-firmware-331352c75d337e3190cedb5d53159cd63504223a.zip
AttPosEKF: Use multiplatform land detector (was custom FixedWing only)
Diffstat (limited to 'src/modules/ekf_att_pos_estimator/AttitudePositionEstimatorEKF.h')
-rw-r--r--src/modules/ekf_att_pos_estimator/AttitudePositionEstimatorEKF.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/modules/ekf_att_pos_estimator/AttitudePositionEstimatorEKF.h b/src/modules/ekf_att_pos_estimator/AttitudePositionEstimatorEKF.h
index 07db924b2..228ffa853 100644
--- a/src/modules/ekf_att_pos_estimator/AttitudePositionEstimatorEKF.h
+++ b/src/modules/ekf_att_pos_estimator/AttitudePositionEstimatorEKF.h
@@ -49,6 +49,7 @@
#include <uORB/topics/vehicle_local_position.h>
#include <uORB/topics/vehicle_gps_position.h>
#include <uORB/topics/vehicle_attitude.h>
+#include <uORB/topics/vehicle_land_detected.h>
#include <uORB/topics/actuator_controls.h>
#include <uORB/topics/vehicle_status.h>
#include <uORB/topics/parameter_update.h>
@@ -141,6 +142,7 @@ private:
int _manual_control_sub; /**< notification of manual control updates */
int _mission_sub;
int _home_sub; /**< home position as defined by commander / user */
+ int _landDetectorSub;
orb_advert_t _att_pub; /**< vehicle attitude */
orb_advert_t _global_pos_pub; /**< global position */
@@ -160,6 +162,7 @@ private:
struct vehicle_gps_position_s _gps; /**< GPS position */
struct wind_estimate_s _wind; /**< wind estimate */
struct range_finder_report _distance; /**< distance estimate */
+ struct vehicle_land_detected_s _landDetector;
struct gyro_scale _gyro_offsets[3];
struct accel_scale _accel_offsets[3];