X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_kalman.c;h=5f32eb7275de8357d8bb50a80680644dee4817e9;hb=8a95afdd417119da6089403f870959a726b0c548;hp=e4cc6d4b9f73676fbc93b750ececfad91b2ed332;hpb=e56e1dc20b3bf18073766da4e26e97d9e1d419fc;p=fw%2Faltos

diff --git a/src/kernel/ao_kalman.c b/src/kernel/ao_kalman.c
index e4cc6d4b..5f32eb72 100644
--- a/src/kernel/ao_kalman.c
+++ b/src/kernel/ao_kalman.c
@@ -24,9 +24,9 @@
 #include "ao_sample.h"
 #include "ao_kalman.h"
 
-static __pdata ao_k_t		ao_k_height;
-static __pdata ao_k_t		ao_k_speed;
-static __pdata ao_k_t		ao_k_accel;
+static ao_k_t		ao_k_height;
+static ao_k_t		ao_k_speed;
+static ao_k_t		ao_k_accel;
 
 #define AO_K_STEP_100		to_fix_v(0.01)
 #define AO_K_STEP_2_2_100	to_fix_v(0.00005)
@@ -37,38 +37,38 @@ static __pdata ao_k_t		ao_k_accel;
 #define AO_K_STEP_1		to_fix_v(1)
 #define AO_K_STEP_2_2_1		to_fix_v(0.5)
 
-__pdata ao_v_t			ao_height;
-__pdata ao_v_t			ao_speed;
-__pdata ao_v_t			ao_accel;
-__xdata ao_v_t			ao_max_height;
-static __pdata ao_k_t		ao_avg_height_scaled;
-__xdata ao_v_t			ao_avg_height;
+ao_v_t			ao_height;
+ao_v_t			ao_speed;
+ao_v_t			ao_accel;
+ao_v_t			ao_max_height;
+static ao_k_t		ao_avg_height_scaled;
+ao_v_t			ao_avg_height;
 
-__pdata ao_v_t			ao_error_h;
+ao_v_t			ao_error_h;
 #if !HAS_ACCEL || AO_FLIGHT_TEST
 #define AO_ERROR_H_SQ_AVG	1
 #endif
 
 #if AO_ERROR_H_SQ_AVG
-__pdata ao_v_t			ao_error_h_sq_avg;
+ao_v_t			ao_error_h_sq_avg;
 #endif
 
 #if HAS_ACCEL
-__pdata ao_v_t			ao_error_a;
+ao_v_t			ao_error_a;
 #endif
 
 static void
 ao_kalman_predict(void)
 {
 #ifdef AO_FLIGHT_TEST
-	if ((int16_t) (ao_sample_tick - ao_sample_prev_tick) > 50) {
+	if ((AO_TICK_SIGNED) (ao_sample_tick - ao_sample_prev_tick) > 50) {
 		ao_k_height += ((ao_k_t) ao_speed * AO_K_STEP_1 +
 				(ao_k_t) ao_accel * AO_K_STEP_2_2_1) >> 4;
 		ao_k_speed += (ao_k_t) ao_accel * AO_K_STEP_1;
 
 		return;
 	}
-	if ((int16_t) (ao_sample_tick - ao_sample_prev_tick) > 5) {
+	if ((AO_TICK_SIGNED) (ao_sample_tick - ao_sample_prev_tick) > 5) {
 		ao_k_height += ((ao_k_t) ao_speed * AO_K_STEP_10 +
 				(ao_k_t) ao_accel * AO_K_STEP_2_2_10) >> 4;
 		ao_k_speed += (ao_k_t) ao_accel * AO_K_STEP_10;
@@ -86,6 +86,7 @@ ao_kalman_predict(void)
 	ao_k_speed += (ao_k_t) ao_accel * AO_K_STEP_100;
 }
 
+#if HAS_BARO
 static void
 ao_kalman_err_height(void)
 {
@@ -140,19 +141,21 @@ ao_kalman_err_height(void)
 #endif
 	}
 }
+#endif
 
+#if HAS_BARO
 static void
 ao_kalman_correct_baro(void)
 {
 	ao_kalman_err_height();
 #ifdef AO_FLIGHT_TEST
-	if ((int16_t) (ao_sample_tick - ao_sample_prev_tick) > 50) {
+	if ((AO_TICK_SIGNED) (ao_sample_tick - ao_sample_prev_tick) > 50) {
 		ao_k_height += (ao_k_t) AO_BARO_K0_1 * ao_error_h;
 		ao_k_speed  += (ao_k_t) AO_BARO_K1_1 * ao_error_h;
 		ao_k_accel  += (ao_k_t) AO_BARO_K2_1 * ao_error_h;
 		return;
 	}
-	if ((int16_t) (ao_sample_tick - ao_sample_prev_tick) > 5) {
+	if ((AO_TICK_SIGNED) (ao_sample_tick - ao_sample_prev_tick) > 5) {
 		ao_k_height += (ao_k_t) AO_BARO_K0_10 * ao_error_h;
 		ao_k_speed  += (ao_k_t) AO_BARO_K1_10 * ao_error_h;
 		ao_k_accel  += (ao_k_t) AO_BARO_K2_10 * ao_error_h;
@@ -163,6 +166,7 @@ ao_kalman_correct_baro(void)
 	ao_k_speed  += (ao_k_t) AO_BARO_K1_100 * ao_error_h;
 	ao_k_accel  += (ao_k_t) AO_BARO_K2_100 * ao_error_h;
 }
+#endif
 
 #if HAS_ACCEL
 
@@ -174,10 +178,10 @@ ao_kalman_err_accel(void)
 	accel = (ao_config.accel_plus_g - ao_sample_accel) * ao_accel_scale;
 
 	/* Can't use ao_accel here as it is the pre-prediction value still */
-	ao_error_a = (accel - ao_k_accel) >> 16;
+	ao_error_a = (ao_v_t) ((accel - ao_k_accel) >> 16);
 }
 
-#ifndef FORCE_ACCEL
+#if !defined(FORCE_ACCEL) && HAS_BARO
 static void
 ao_kalman_correct_both(void)
 {
@@ -185,7 +189,7 @@ ao_kalman_correct_both(void)
 	ao_kalman_err_accel();
 
 #ifdef AO_FLIGHT_TEST
-	if ((int16_t) (ao_sample_tick - ao_sample_prev_tick) > 50) {
+	if ((AO_TICK_SIGNED) (ao_sample_tick - ao_sample_prev_tick) > 50) {
 		if (ao_flight_debug) {
 			printf ("correct speed %g + (%g * %g) + (%g * %g) = %g\n",
 				ao_k_speed / (65536.0 * 16.0),
@@ -206,7 +210,7 @@ ao_kalman_correct_both(void)
 			(ao_k_t) AO_BOTH_K21_1 * ao_error_a;
 		return;
 	}
-	if ((int16_t) (ao_sample_tick - ao_sample_prev_tick) > 5) {
+	if ((AO_TICK_SIGNED) (ao_sample_tick - ao_sample_prev_tick) > 5) {
 		if (ao_flight_debug) {
 			printf ("correct speed %g + (%g * %g) + (%g * %g) = %g\n",
 				ao_k_speed / (65536.0 * 16.0),
@@ -255,12 +259,14 @@ ao_kalman_correct_accel(void)
 {
 	ao_kalman_err_accel();
 
-	if ((int16_t) (ao_sample_tick - ao_sample_prev_tick) > 5) {
+#ifdef AO_FLIGHT_TEST
+	if ((AO_TICK_SIGNED) (ao_sample_tick - ao_sample_prev_tick) > 5) {
 		ao_k_height +=(ao_k_t) AO_ACCEL_K0_10 * ao_error_a;
 		ao_k_speed  += (ao_k_t) AO_ACCEL_K1_10 * ao_error_a;
 		ao_k_accel  += (ao_k_t) AO_ACCEL_K2_10 * ao_error_a;
 		return;
 	}
+#endif
 	ao_k_height += (ao_k_t) AO_ACCEL_K0_100 * ao_error_a;
 	ao_k_speed  += (ao_k_t) AO_ACCEL_K1_100 * ao_error_a;
 	ao_k_accel  += (ao_k_t) AO_ACCEL_K2_100 * ao_error_a;
@@ -269,10 +275,30 @@ ao_kalman_correct_accel(void)
 #endif /* else FORCE_ACCEL */
 #endif /* HAS_ACCEL */
 
+#if !HAS_BARO
+static ao_k_t	ao_k_height_prev;
+static ao_k_t	ao_k_speed_prev;
+
+/*
+ * While in pad mode without a barometric sensor, remove accumulated
+ * speed and height values to reduce the effect of systematic sensor
+ * error
+ */
+void
+ao_kalman_reset_accumulate(void)
+{
+	ao_k_height -= ao_k_height_prev;
+	ao_k_speed -= ao_k_speed_prev;
+	ao_k_height_prev = ao_k_height;
+	ao_k_speed_prev = ao_k_speed;
+}
+#endif
+
 void
 ao_kalman(void)
 {
 	ao_kalman_predict();
+#if HAS_BARO
 #if HAS_ACCEL
 	if (ao_flight_state <= ao_flight_coast) {
 #ifdef FORCE_ACCEL
@@ -283,18 +309,27 @@ ao_kalman(void)
 	} else
 #endif
 		ao_kalman_correct_baro();
-	ao_height = from_fix(ao_k_height);
-	ao_speed = from_fix(ao_k_speed);
-	ao_accel = from_fix(ao_k_accel);
+#else
+#if HAS_ACCEL
+	ao_kalman_correct_accel();
+#endif
+#endif
+	ao_height = (ao_v_t) from_fix(ao_k_height);
+	ao_speed = (ao_v_t) from_fix(ao_k_speed);
+	ao_accel = (ao_v_t) from_fix(ao_k_accel);
 	if (ao_height > ao_max_height)
 		ao_max_height = ao_height;
+#if HAS_BARO
 	ao_avg_height_scaled = ao_avg_height_scaled - ao_avg_height + ao_sample_height;
+#else
+	ao_avg_height_scaled = ao_avg_height_scaled - ao_avg_height + ao_height;
+#endif
 #ifdef AO_FLIGHT_TEST
-	if ((int16_t) (ao_sample_tick - ao_sample_prev_tick) > 50)
+	if ((AO_TICK_SIGNED) (ao_sample_tick - ao_sample_prev_tick) > 50)
 		ao_avg_height = (ao_avg_height_scaled + 1) >> 1;
-	else if ((int16_t) (ao_sample_tick - ao_sample_prev_tick) > 5)
+	else if ((AO_TICK_SIGNED) (ao_sample_tick - ao_sample_prev_tick) > 5)
 		ao_avg_height = (ao_avg_height_scaled + 7) >> 4;
 	else 
 #endif
-		ao_avg_height = (ao_avg_height_scaled + 63) >> 7;
+		ao_avg_height = (ao_v_t) ((ao_avg_height_scaled + 63) >> 7);
 }