enable ground effect zone when land detector is updated

This commit is contained in:
Elia Tarasov
2019-03-21 10:07:12 +01:00
committed by Roman Bapst
parent 0c24aa6149
commit 04a486f13d
3 changed files with 14 additions and 9 deletions
+5
View File
@@ -1398,6 +1398,11 @@ void Ekf2::run()
_ekf.set_gnd_effect_flag(true);
}
// update ground effect flag based on land detector state
else if (vehicle_land_detected_updated && _gnd_effect_deadzone.get() > 0.0f) {
_ekf.set_gnd_effect_flag(vehicle_land_detected.in_ground_effect);
}
lpos.dist_bottom_rate = -lpos.vz; // Distance to bottom surface (ground) change rate
_ekf.get_ekf_lpos_accuracy(&lpos.eph, &lpos.epv);
+2 -2
View File
@@ -185,8 +185,8 @@ private:
bool _previous_arming_state{false}; ///< stores the previous _arming.armed state
int _parameterSub{-1};
int _armingSub{-1};
int _parameterSub{ -1};
int _armingSub{ -1};
};
@@ -122,13 +122,13 @@ private:
float landSpeed;
} _params{};
int _vehicleLocalPositionSub{-1};
int _vehicleLocalPositionSetpointSub{-1};
int _actuatorsSub{-1};
int _attitudeSub{-1};
int _sensor_bias_sub{-1};
int _vehicle_control_mode_sub{-1};
int _battery_sub{-1};
int _vehicleLocalPositionSub{ -1};
int _vehicleLocalPositionSetpointSub{ -1};
int _actuatorsSub{ -1};
int _attitudeSub{ -1};
int _sensor_bias_sub{ -1};
int _vehicle_control_mode_sub{ -1};
int _battery_sub{ -1};
vehicle_local_position_s _vehicleLocalPosition {};
vehicle_local_position_setpoint_s _vehicleLocalPositionSetpoint {};