altos: Set reasonable accel values when !HAS_ACCEL

This lets us use telemetrum log and telemetry formats for balloons

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/core/ao_log_metrum.c b/src/core/ao_log_metrum.c
index 91624d980f18b2c636db081668d16ce3f64ea62d..9b17adc2d7c66a45057bbd2348945ff39d5cb9cd 100644 (file)
--- a/src/core/ao_log_metrum.c
+++ b/src/core/ao_log_metrum.c
@@ -116,7 +116,9 @@ ao_log(void)
                                log.u.sensor.pres = ao_data_ring[ao_log_data_pos].ms5607_raw.pres;
                                log.u.sensor.temp = ao_data_ring[ao_log_data_pos].ms5607_raw.temp;
 #endif
+#if HAS_ACCEL
                                log.u.sensor.accel = ao_data_accel(&ao_data_ring[ao_log_data_pos]);
+#endif
                                ao_log_metrum(&log);
                                if (ao_log_state <= ao_flight_coast)
                                        next_sensor = log.tick + AO_SENSOR_INTERVAL_ASCENT;

diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index 5a00d825671d7ae35ceee5f1f06ddce0b7f98081..a1c19185416fd56cdd3a1dac6bcabf892ef8ec0c 100644 (file)
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -187,7 +187,9 @@ ao_send_metrum_sensor(void)
        telemetry.generic.type = AO_TELEMETRY_METRUM_SENSOR;
 
        telemetry.metrum_sensor.state = ao_flight_state;
+#if HAS_ACCEL
        telemetry.metrum_sensor.accel = ao_data_accel(packet);
+#endif
        telemetry.metrum_sensor.pres = ao_data_pres(packet);
        telemetry.metrum_sensor.temp = ao_data_temp(packet);
 
@@ -216,9 +218,15 @@ ao_send_metrum_data(void)
                telemetry.generic.type = AO_TELEMETRY_METRUM_DATA;
 
                telemetry.metrum_data.ground_pres = ao_ground_pres;
+#if HAS_ACCEL
                telemetry.metrum_data.ground_accel = ao_ground_accel;
                telemetry.metrum_data.accel_plus_g = ao_config.accel_plus_g;
                telemetry.metrum_data.accel_minus_g = ao_config.accel_minus_g;
+#else
+               telemetry.metrum_data.ground_accel = 1;
+               telemetry.metrum_data.accel_plus_g = 0;
+               telemetry.metrum_data.accel_minus_g = 2;
+#endif
 
                ao_radio_send(&telemetry, sizeof (telemetry));
                ao_telemetry_metrum_data_cur = ao_telemetry_metrum_data_max;