LPE fault relaxation and sitl fix (#6146)

* Set LPE FUSE for standard iris sitl config.

* Relax fault detection handling.

* Always correct lidar.
This commit is contained in:
James Goppert 2016-12-23 15:08:37 -05:00 committed by GitHub
parent 661fda2b2a
commit c28cd76e5f
9 changed files with 37 additions and 40 deletions

View File

@ -42,6 +42,9 @@ param set MPC_Z_VEL_P 0.6
param set MPC_Z_VEL_I 0.15
param set EKF2_GBIAS_INIT 0.01
param set EKF2_ANGERR_INIT 0.01
param set LPE_FUSION 247
# 11110111 no vis yaw (1 << 3)
replay tryapplyparams
simulator start -s
rgbledsim start

View File

@ -61,7 +61,7 @@ param set MIS_TAKEOFF_ALT 2
param set NAV_ACC_RAD 1.0
param set CBRK_GPSFAIL 240024
param set LPE_FUSION 246
# 11110110 no vis (1 << 3) yaw and no gps (1 << 0)
# 11110110 no vis yaw (1 << 3) and no gps (1 << 0)
replay tryapplyparams
simulator start -s

View File

@ -872,7 +872,6 @@ void BlockLocalPositionEstimator::predict()
}
_P += dP;
_xLowPass.update(_x);
_aglLowPass.update(agl());
}

View File

@ -85,13 +85,11 @@ void BlockLocalPositionEstimator::baroCorrect()
mavlink_and_console_log_info(&mavlink_log_pub, "[lpe] baro OK");
}
// kalman filter correction if no fault
if (!(_sensorFault & SENSOR_BARO)) {
Matrix<float, n_x, n_y_baro> K = _P * C.transpose() * S_I;
Vector<float, n_x> dx = K * r;
_x += dx;
_P -= K * C * _P;
}
// kalman filter correction always
Matrix<float, n_x, n_y_baro> K = _P * C.transpose() * S_I;
Vector<float, n_x> dx = K * r;
_x += dx;
_P -= K * C * _P;
}
void BlockLocalPositionEstimator::baroCheckTimeout()

View File

@ -190,7 +190,10 @@ void BlockLocalPositionEstimator::gpsCorrect()
// fault detection
float beta = (r.transpose() * (S_I * r))(0, 0);
if (beta > BETA_TABLE[n_y_gps]) {
// artifically increase beta threshhold to prevent fault during landing
float beta_thresh = 1e2f;
if (beta / BETA_TABLE[n_y_gps] > beta_thresh) {
if (!(_sensorFault & SENSOR_GPS)) {
mavlink_log_critical(&mavlink_log_pub, "[lpe] gps fault %3g %3g %3g %3g %3g %3g",
double(r(0)*r(0) / S_I(0, 0)), double(r(1)*r(1) / S_I(1, 1)), double(r(2)*r(2) / S_I(2, 2)),
@ -203,13 +206,11 @@ void BlockLocalPositionEstimator::gpsCorrect()
mavlink_and_console_log_info(&mavlink_log_pub, "[lpe] GPS OK");
}
// kalman filter correction if no hard fault
if (!(_sensorFault & SENSOR_GPS)) {
Matrix<float, n_x, n_y_gps> K = _P * C.transpose() * S_I;
Vector<float, n_x> dx = K * r;
_x += dx;
_P -= K * C * _P;
}
// kalman filter correction always for GPS
Matrix<float, n_x, n_y_gps> K = _P * C.transpose() * S_I;
Vector<float, n_x> dx = K * r;
_x += dx;
_P -= K * C * _P;
}
void BlockLocalPositionEstimator::gpsCheckTimeout()

View File

@ -67,7 +67,10 @@ void BlockLocalPositionEstimator::landCorrect()
// fault detection
float beta = (r.transpose() * (S_I * r))(0, 0);
if (beta > BETA_TABLE[n_y_land]) {
// artifically increase beta threshhold to prevent fault during landing
float beta_thresh = 1e2f;
if (beta / BETA_TABLE[n_y_land] > beta_thresh) {
if (!(_sensorFault & SENSOR_LAND)) {
_sensorFault |= SENSOR_LAND;
mavlink_and_console_log_info(&mavlink_log_pub, "[lpe] land fault, beta %5.2f", double(beta));
@ -81,13 +84,11 @@ void BlockLocalPositionEstimator::landCorrect()
mavlink_and_console_log_info(&mavlink_log_pub, "[lpe] land OK");
}
// kalman filter correction if no fault
if (!(_sensorFault & SENSOR_LAND)) {
Matrix<float, n_x, n_y_land> K = _P * C.transpose() * S_I;
Vector<float, n_x> dx = K * r;
_x += dx;
_P -= K * C * _P;
}
// kalman filter correction always for land detector
Matrix<float, n_x, n_y_land> K = _P * C.transpose() * S_I;
Vector<float, n_x> dx = K * r;
_x += dx;
_P -= K * C * _P;
}
void BlockLocalPositionEstimator::landCheckTimeout()

View File

@ -113,13 +113,11 @@ void BlockLocalPositionEstimator::lidarCorrect()
mavlink_and_console_log_info(&mavlink_log_pub, "[lpe] lidar OK");
}
// kalman filter correction if no fault
if (!(_sensorFault & SENSOR_LIDAR)) {
Matrix<float, n_x, n_y_lidar> K = _P * C.transpose() * S_I;
Vector<float, n_x> dx = K * r;
_x += dx;
_P -= K * C * _P;
}
// kalman filter correction always
Matrix<float, n_x, n_y_lidar> K = _P * C.transpose() * S_I;
Vector<float, n_x> dx = K * r;
_x += dx;
_P -= K * C * _P;
}
void BlockLocalPositionEstimator::lidarCheckTimeout()

View File

@ -91,13 +91,11 @@ void BlockLocalPositionEstimator::mocapCorrect()
//mavlink_and_console_log_info(&mavlink_log_pub, "[lpe] mocap OK");
}
// kalman filter correction if no fault
if (!(_sensorFault & SENSOR_MOCAP)) {
Matrix<float, n_x, n_y_mocap> K = _P * C.transpose() * S_I;
Vector<float, n_x> dx = K * r;
_x += dx;
_P -= K * C * _P;
}
// kalman filter correction always
Matrix<float, n_x, n_y_mocap> K = _P * C.transpose() * S_I;
Vector<float, n_x> dx = K * r;
_x += dx;
_P -= K * C * _P;
}
void BlockLocalPositionEstimator::mocapCheckTimeout()

View File

@ -137,7 +137,6 @@ void BlockLocalPositionEstimator::sonarCorrect()
_x += dx;
_P -= K * C * _P;
}
}
void BlockLocalPositionEstimator::sonarCheckTimeout()