altos: Switch Tm and Tn to common telemetry code

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

diff --git a/src/Makefile.proto b/src/Makefile.proto
index 5322df176ac69275da163732b4762fc0ca9dbcc2..309fd75d0de29751b94f8804a967d53b2b42f418 100644 (file)
--- a/src/Makefile.proto
+++ b/src/Makefile.proto
@@ -195,7 +195,7 @@ TMINI_TASK_SRC = \
        ao_log.c \
        ao_log_tiny.c \
        ao_report.c \
-       ao_telemetry_tiny.c
+       ao_telemetry.c
 
 TMINI_MAIN_SRC = \
        ao_telemini.c
@@ -225,7 +225,7 @@ TNANO_TASK_SRC = \
        ao_log.c \
        ao_log_tiny.c \
        ao_report.c \
-       ao_telemetry_tiny.c
+       ao_telemetry.c
 
 TNANO_MAIN_SRC = \
        ao_telenano.c

diff --git a/src/ao_telemetry.c b/src/ao_telemetry.c
index dcd0ff625926a376fd62ab2f96f6d5e9200e8d28..603a67913b9bd829e76c47ea4990824a7ea8d0f5 100644 (file)
--- a/src/ao_telemetry.c
+++ b/src/ao_telemetry.c
@@ -77,9 +77,15 @@ ao_send_sensor(void)
        telemetry.sensor.height = ao_height;
 
        telemetry.sensor.ground_pres = ao_ground_pres;
+#if HAS_ACCEL
        telemetry.sensor.ground_accel = ao_ground_accel;
        telemetry.sensor.accel_plus_g = ao_config.accel_plus_g;
        telemetry.sensor.accel_minus_g = ao_config.accel_minus_g;
+#else
+       telemetry.sensor.ground_accel = 0;
+       telemetry.sensor.accel_plus_g = 0;
+       telemetry.sensor.accel_minus_g = 0;
+#endif
 
        ao_radio_send(&telemetry, sizeof (telemetry));
 }

diff --git a/src/ao_telemini.c b/src/ao_telemini.c
index dbc3b74c097bc2ab655c39b80d4d421c9f79137d..19d03692bef435641018218e271c89ab8ce37763 100644 (file)
--- a/src/ao_telemini.c
+++ b/src/ao_telemini.c
@@ -42,7 +42,7 @@ main(void)
        ao_flight_init();
        ao_log_init();
        ao_report_init();
-       ao_telemetry_tiny_init();
+       ao_telemetry_init();
        ao_radio_init();
        ao_packet_slave_init(TRUE);
        ao_igniter_init();

diff --git a/src/ao_telenano.c b/src/ao_telenano.c
index 47b7b3c3b1852bc01c4a8c6d63c7cc47251d0e1c..40822b6e1d145d973d771bfe3eeee23e4bec0bcb 100644 (file)
--- a/src/ao_telenano.c
+++ b/src/ao_telenano.c
@@ -42,7 +42,7 @@ main(void)
        ao_flight_nano_init();
        ao_log_init();
        ao_report_init();
-       ao_telemetry_tiny_init();
+       ao_telemetry_init();
        ao_radio_init();
        ao_packet_slave_init(TRUE);
        ao_config_init();