Build fixes

This commit is contained in:
Lorenz Meier
2014-02-21 13:22:04 +01:00
parent 87410b5bde
commit c5311b18fe
2 changed files with 3 additions and 7 deletions
@@ -1,9 +1,5 @@
#include "estimator.h"
// For debugging only
#include <cstdlib>
#include <stdio.h>
// Global variables
float KH[n_states][n_states]; // intermediate result used for covariance updates
float KHP[n_states][n_states]; // intermediate result used for covariance updates
@@ -1840,8 +1836,6 @@ void InitialiseFilter(float (&initvelNED)[3])
Vector3f initMagXYZ;
initMagXYZ = magData - magBias;
AttitudeInit(accel.x, accel.y, accel.z, initMagXYZ.x, initMagXYZ.y, initMagXYZ.z, initQuat);
printf("initializing: accel: %8.4f %8.4f %8.4f, mag: %8.4f %8.4f %8.4f q: %8.4f %8.4f %8.4f %8.4f\n",
accel.x, accel.y, accel.z, initMagXYZ.x, initMagXYZ.y, initMagXYZ.z, initQuat[0], initQuat[1], initQuat[2], initQuat[3]);
// Calculate initial Tbn matrix and rotate Mag measurements into NED
// to set initial NED magnetic field states
@@ -172,6 +172,7 @@ private:
perf_counter_t _perf_airspeed; ///<local performance counter for airspeed updates
bool _initialized;
bool _gps_initialized;
struct {
float throttle_cruise;
@@ -262,7 +263,8 @@ FixedwingEstimator::FixedwingEstimator() :
_perf_airspeed(perf_alloc(PC_COUNT, "fw_ekf_aspd_upd")),
/* states */
_initialized(false)
_initialized(false),
_gps_initialized(false)
{
_parameter_handles.throttle_cruise = param_find("NAV_DUMMY");