dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

ekf2: delete isYawResetAuthorized()

This commit is contained in:
Daniel Agar 2022-03-21 14:23:26 -04:00
parent 0f1f6daa1a
commit e6e27e694e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/ekf2/EKF/ekf.h
View File

@ -851,7 +851,6 @@ private:
float getTerrainVPos() const { return isTerrainEstimateValid() ? _terrain_vpos : _last_on_ground_posD; }
void runOnGroundYawReset();
bool isYawResetAuthorized() const { return !_is_yaw_fusion_inhibited; }
bool canResetMagHeading() const;
void runInAirYawReset(const Vector3f &mag);

4
src/modules/ekf2/EKF/mag_control.cpp
View File

@ -155,7 +155,7 @@ void Ekf::checkHaglYawResetReq()
void Ekf::runOnGroundYawReset()
{
if (_mag_yaw_reset_req && isYawResetAuthorized()) {
if (_mag_yaw_reset_req && !_is_yaw_fusion_inhibited) {
const bool has_realigned_yaw = canResetMagHeading() ? resetMagHeading() : false;
if (has_realigned_yaw) {
@ -180,7 +180,7 @@ bool Ekf::canResetMagHeading() const
void Ekf::runInAirYawReset(const Vector3f &mag_sample)
{
if (_mag_yaw_reset_req && isYawResetAuthorized()) {
if (_mag_yaw_reset_req && !_is_yaw_fusion_inhibited) {
bool has_realigned_yaw = false;
if (_control_status.flags.gps && _control_status.flags.fixed_wing) {