altos: Make TeleMini v2.0 fit

[fw/altos] / src / core / ao_telemetry.c

diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index dfde22350d84c0be1a64a1fe43ebfca1e2fd124e..9c67303081aeb71e0cda739b9da2800fbf7b8913 100644 (file)
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -19,9 +19,16 @@
 #include "ao_log.h"
 #include "ao_product.h"
 
+#ifndef HAS_RDF
+#define HAS_RDF 1
+#endif
+
 static __pdata uint16_t ao_telemetry_interval;
 static __pdata uint8_t ao_rdf = 0;
+
+#if HAS_RDF
 static __pdata uint16_t ao_rdf_time;
+#endif
 
 #if HAS_APRS
 static __pdata uint16_t ao_aprs_time;
@@ -164,6 +171,36 @@ ao_send_mega_data(void)
 }
 #endif /* AO_SEND_MEGA */
 
+#ifdef AO_SEND_MINI
+
+static void
+ao_send_mini(void)
+{
+       __xdata struct ao_data *packet = (__xdata struct ao_data *) &ao_data_ring[ao_data_ring_prev(ao_sample_data)];
+                       
+       telemetry.generic.tick = packet->tick;
+       telemetry.generic.type = AO_TELEMETRY_MINI;
+
+       telemetry.mini.state = ao_flight_state;
+
+       telemetry.mini.v_batt = packet->adc.v_batt;
+       telemetry.mini.sense_a = packet->adc.sense_a;
+       telemetry.mini.sense_m = packet->adc.sense_m;
+
+       telemetry.mini.pres = ao_data_pres(packet);
+       telemetry.mini.temp = ao_data_temp(packet);
+
+       telemetry.mini.acceleration = ao_accel;
+       telemetry.mini.speed = ao_speed;
+       telemetry.mini.height = ao_height;
+
+       telemetry.mini.ground_pres = ao_ground_pres;
+
+       ao_radio_send(&telemetry, sizeof (telemetry));
+}
+
+#endif
+
 #ifdef AO_SEND_ALL_BARO
 static uint8_t         ao_baro_sample;
 
@@ -299,7 +336,10 @@ ao_telemetry(void)
        for (;;) {
                while (ao_telemetry_interval == 0)
                        ao_sleep(&telemetry);
-               time = ao_rdf_time = ao_time();
+               time = ao_time();
+#if HAS_RDF
+               ao_rdf_time = time;
+#endif
 #if HAS_APRS
                ao_aprs_time = time;
 #endif
@@ -313,12 +353,16 @@ ao_telemetry(void)
                                ao_send_baro();
 #endif
 #if HAS_FLIGHT
-#ifdef AO_SEND_MEGA
+# ifdef AO_SEND_MEGA
                                ao_send_mega_sensor();
                                ao_send_mega_data();
-#else
+# else
+#  ifdef AO_SEND_MINI
+                               ao_send_mini();
+#  else
                                ao_send_sensor();
-#endif
+#  endif
+# endif
 #endif
 
 #if HAS_COMPANION
@@ -332,6 +376,7 @@ ao_telemetry(void)
 #endif
                        }
 #ifndef AO_SEND_ALL_BARO
+#if HAS_RDF
                        if (ao_rdf &&
 #if HAS_APRS
                            !(ao_config.radio_enable & AO_RADIO_DISABLE_RDF) &&
@@ -349,6 +394,7 @@ ao_telemetry(void)
 #endif
                                        ao_radio_rdf();
                        }
+#endif /* HAS_RDF */
 #if HAS_APRS
                        if (ao_config.aprs_interval != 0 &&
                            (int16_t) (ao_time() - ao_aprs_time) >= 0)
@@ -415,6 +461,7 @@ ao_telemetry_set_interval(uint16_t interval)
        ao_wakeup(&telemetry);
 }
 
+#if HAS_RDF
 void
 ao_rdf_set(uint8_t rdf)
 {
@@ -425,6 +472,7 @@ ao_rdf_set(uint8_t rdf)
                ao_rdf_time = ao_time() + AO_RDF_INTERVAL_TICKS;
        }
 }
+#endif
 
 __xdata struct ao_task ao_telemetry_task;