X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_sample.c;h=9cba36c1004b37ec31717e7c4431e08ede4bf615;hb=HEAD;hp=3f5fc7a98c557af012d053dd0b14068305f6924b;hpb=b140da92536d7c48ba37868f1c2afce7bb86dfdb;p=fw%2Faltos diff --git a/src/kernel/ao_sample.c b/src/kernel/ao_sample.c index 3f5fc7a9..422ccec6 100644 --- a/src/kernel/ao_sample.c +++ b/src/kernel/ao_sample.c @@ -21,6 +21,10 @@ #include #endif +#ifndef HAS_KALMAN +#define HAS_KALMAN 1 +#endif + #if HAS_GYRO #include #endif @@ -57,7 +61,7 @@ angle_t ao_sample_orient; angle_t ao_sample_orients[AO_NUM_ORIENT]; uint8_t ao_sample_orient_pos; #endif -#ifdef HAS_MOTOR_PRESSURE +#if HAS_MOTOR_PRESSURE motor_pressure_t ao_sample_motor_pressure; #endif @@ -340,7 +344,7 @@ ao_sample_preflight_update(void) ++nsamples; else ao_sample_preflight_set(); -#if !HAS_BARO +#if !HAS_BARO && HAS_KALMAN if ((nsamples & 0x3f) == 0) ao_kalman_reset_accumulate(); #endif @@ -406,7 +410,9 @@ ao_sample(void) else { if (ao_flight_state < ao_flight_boost) ao_sample_preflight_update(); +#if HAS_KALMAN ao_kalman(); +#endif #if HAS_GYRO ao_sample_rotate(); #endif