|
|
|
@ -108,7 +108,6 @@
@@ -108,7 +108,6 @@
|
|
|
|
|
#include <AP_ADC.h> // ArduPilot Mega Analog to Digital Converter Library |
|
|
|
|
#include <AP_ADC_AnalogSource.h> |
|
|
|
|
#include <AP_Baro.h> |
|
|
|
|
#include <AP_Baro_Glitch.h> // Baro glitch protection library |
|
|
|
|
#include <AP_Compass.h> // ArduPilot Mega Magnetometer Library |
|
|
|
|
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library |
|
|
|
|
#include <AP_Curve.h> // Curve used to linearlise throttle pwm to thrust |
|
|
|
@ -265,8 +264,6 @@ static AP_Int8 *flight_modes = &g.flight_mode1;
@@ -265,8 +264,6 @@ static AP_Int8 *flight_modes = &g.flight_mode1;
|
|
|
|
|
|
|
|
|
|
static AP_Baro barometer; |
|
|
|
|
|
|
|
|
|
static Baro_Glitch baro_glitch(barometer); |
|
|
|
|
|
|
|
|
|
#if CONFIG_COMPASS == HAL_COMPASS_PX4 |
|
|
|
|
static AP_Compass_PX4 compass; |
|
|
|
|
#elif CONFIG_COMPASS == HAL_COMPASS_VRBRAIN |
|
|
|
@ -606,9 +603,9 @@ static float G_Dt = 0.02;
@@ -606,9 +603,9 @@ static float G_Dt = 0.02;
|
|
|
|
|
// Inertial Navigation |
|
|
|
|
//////////////////////////////////////////////////////////////////////////////// |
|
|
|
|
#if AP_AHRS_NAVEKF_AVAILABLE |
|
|
|
|
static AP_InertialNav_NavEKF inertial_nav(ahrs, barometer, gps_glitch, baro_glitch); |
|
|
|
|
static AP_InertialNav_NavEKF inertial_nav(ahrs, barometer, gps_glitch); |
|
|
|
|
#else |
|
|
|
|
static AP_InertialNav inertial_nav(ahrs, barometer, gps_glitch, baro_glitch); |
|
|
|
|
static AP_InertialNav inertial_nav(ahrs, barometer, gps_glitch); |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////// |
|
|
|
|