altos: Support accel-only IMU configurations

[fw/altos] / src / kernel / ao_sample.c

diff --git a/src/kernel/ao_sample.c b/src/kernel/ao_sample.c
index 67f20aff9093b5941a3ccee9ffc5e6e752f96479..91cf113e3a6ae58880be274bec43653154e485fe 100644 (file)
--- a/src/kernel/ao_sample.c
+++ b/src/kernel/ao_sample.c
@@ -44,10 +44,12 @@ alt_t               ao_sample_height;
 #if HAS_ACCEL
 accel_t                ao_sample_accel;
 #endif
-#if HAS_GYRO
+#if HAS_IMU
 accel_t                ao_sample_accel_along;
 accel_t                ao_sample_accel_across;
 accel_t                ao_sample_accel_through;
+#endif
+#if HAS_GYRO
 gyro_t         ao_sample_roll;
 gyro_t         ao_sample_pitch;
 gyro_t         ao_sample_yaw;
@@ -73,10 +75,13 @@ accel_t             ao_accel_2g;            /* factory accel calibration */
 int32_t                ao_accel_scale;         /* sensor to m/s² conversion */
 #endif
 
-#if HAS_GYRO
+#if HAS_IMU
 accel_t                ao_ground_accel_along;
 accel_t                ao_ground_accel_across;
 accel_t                ao_ground_accel_through;
+#endif
+
+#if HAS_GYRO
 int32_t                ao_ground_pitch;
 int32_t                ao_ground_yaw;
 int32_t                ao_ground_roll;
@@ -91,10 +96,12 @@ int32_t ao_sample_pres_sum;
 #if HAS_ACCEL
 int32_t ao_sample_accel_sum;
 #endif
-#if HAS_GYRO
+#if HAS_IMU
 int32_t ao_sample_accel_along_sum;
 int32_t ao_sample_accel_across_sum;
 int32_t        ao_sample_accel_through_sum;
+#endif
+#if HAS_GYRO
 int32_t ao_sample_pitch_sum;
 int32_t ao_sample_yaw_sum;
 int32_t        ao_sample_roll_sum;
@@ -114,10 +121,12 @@ ao_sample_preflight_add(void)
 #if HAS_BARO
        ao_sample_pres_sum += ao_sample_pres;
 #endif
-#if HAS_GYRO
+#if HAS_IMU
        ao_sample_accel_along_sum += ao_sample_accel_along;
        ao_sample_accel_across_sum += ao_sample_accel_across;
        ao_sample_accel_through_sum += ao_sample_accel_through;
+#endif
+#if HAS_GYRO
        ao_sample_pitch_sum += ao_sample_pitch;
        ao_sample_yaw_sum += ao_sample_yaw;
        ao_sample_roll_sum += ao_sample_roll;
@@ -184,10 +193,13 @@ ao_sample_preflight_set(void)
        ao_ground_height = pres_to_altitude(ao_ground_pres);
        ao_sample_pres_sum = 0;
 #endif
-#if HAS_GYRO
+#if HAS_IMU
        ao_ground_accel_along = ao_sample_accel_along_sum >> 9;
        ao_ground_accel_across = ao_sample_accel_across_sum >> 9;
        ao_ground_accel_through = ao_sample_accel_through_sum >> 9;
+
+#endif
+#if HAS_GYRO
        ao_ground_pitch = ao_sample_pitch_sum;
        ao_ground_yaw = ao_sample_yaw_sum;
        ao_ground_roll = ao_sample_roll_sum;
@@ -353,10 +365,12 @@ ao_sample(void)
 #if HAS_ACCEL
                ao_sample_accel = ao_data_accel(ao_data);
 #endif
-#if HAS_GYRO
+#if HAS_IMU
                ao_sample_accel_along = ao_data_along(ao_data);
                ao_sample_accel_across = ao_data_across(ao_data);
                ao_sample_accel_through = ao_data_through(ao_data);
+#endif
+#if HAS_GYRO
                ao_sample_pitch = ao_data_pitch(ao_data);
                ao_sample_yaw = ao_data_yaw(ao_data);
                ao_sample_roll = ao_data_roll(ao_data);
@@ -393,13 +407,15 @@ ao_sample_init(void)
        ao_sample_accel_sum = 0;
        ao_sample_accel = 0;
 #endif
-#if HAS_GYRO
+#if HAS_IMU
        ao_sample_accel_along_sum = 0;
        ao_sample_accel_across_sum = 0;
        ao_sample_accel_through_sum = 0;
        ao_sample_accel_along = 0;
        ao_sample_accel_across = 0;
        ao_sample_accel_through = 0;
+#endif
+#if HAS_GYRO
        ao_sample_pitch_sum = 0;
        ao_sample_yaw_sum = 0;
        ao_sample_roll_sum = 0;