fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 07:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

ekf2: compile fixes after rebase

Browse Source
This commit is contained in:
Julian Oes
2016-04-11 18:01:49 +02:00
parent e91f587438
commit 08ce231d76
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/ekf2/ekf2_main.cpp
-4
View File
@@ -136,7 +136,6 @@ private:
int _gps_sub = -1; int _gps_sub = -1;
int _airspeed_sub = -1; int _airspeed_sub = -1;
int _params_sub = -1; int _params_sub = -1;
int _vehicle_status_sub = -1;
int _optical_flow_sub = -1; int _optical_flow_sub = -1;
int _range_finder_sub = -1; int _range_finder_sub = -1;
int _actuator_armed_sub = -1; int _actuator_armed_sub = -1;
@@ -318,7 +317,6 @@ void Ekf2::task_main()
_gps_sub = orb_subscribe(ORB_ID(vehicle_gps_position)); _gps_sub = orb_subscribe(ORB_ID(vehicle_gps_position));
_airspeed_sub = orb_subscribe(ORB_ID(airspeed)); _airspeed_sub = orb_subscribe(ORB_ID(airspeed));
_params_sub = orb_subscribe(ORB_ID(parameter_update)); _params_sub = orb_subscribe(ORB_ID(parameter_update));
_vehicle_status_sub = orb_subscribe(ORB_ID(vehicle_status));
_optical_flow_sub = orb_subscribe(ORB_ID(optical_flow)); _optical_flow_sub = orb_subscribe(ORB_ID(optical_flow));
_range_finder_sub = orb_subscribe(ORB_ID(distance_sensor)); _range_finder_sub = orb_subscribe(ORB_ID(distance_sensor));
_actuator_armed_sub = orb_subscribe(ORB_ID(actuator_armed)); _actuator_armed_sub = orb_subscribe(ORB_ID(actuator_armed));
@@ -339,7 +337,6 @@ void Ekf2::task_main()
sensor_combined_s sensors = {}; sensor_combined_s sensors = {};
vehicle_gps_position_s gps = {}; vehicle_gps_position_s gps = {};
airspeed_s airspeed = {}; airspeed_s airspeed = {};
vehicle_control_mode_s vehicle_control_mode = {};
optical_flow_s optical_flow = {}; optical_flow_s optical_flow = {};
distance_sensor_s range_finder = {}; distance_sensor_s range_finder = {};
actuator_armed_s actuator_armed = {}; actuator_armed_s actuator_armed = {};
@@ -373,7 +370,6 @@ void Ekf2::task_main()
bool gps_updated = false; bool gps_updated = false;
bool airspeed_updated = false; bool airspeed_updated = false;
bool vehicle_status_updated = false;
bool optical_flow_updated = false; bool optical_flow_updated = false;
bool range_finder_updated = false; bool range_finder_updated = false;
bool actuator_armed_updated = false; bool actuator_armed_updated = false;