Merge branch 'master' into micropeak-logging
[fw/altos] / src / core / ao_telemetry.c
index 6e8fc02ff56afd7de67b219454b618598455199c..8d440e15410ff4bd7833bcd5da6e1380d8ba46f9 100644 (file)
 #include "ao_product.h"
 
 static __pdata uint16_t ao_telemetry_interval;
-static __pdata int8_t ao_telemetry_config_max;
-static __pdata int8_t ao_telemetry_config_cur;
-#if HAS_GPS
-static __pdata int8_t ao_telemetry_loc_cur;
-static __pdata int8_t ao_telemetry_sat_cur;
-#endif
-#if HAS_COMPANION
-static __pdata int8_t ao_telemetry_companion_max;
-static __pdata int8_t ao_telemetry_companion_cur;
-#endif
 static __pdata uint8_t ao_rdf = 0;
 static __pdata uint16_t ao_rdf_time;
 
-#define AO_RDF_INTERVAL_TICKS  AO_SEC_TO_TICKS(5)
-#define AO_RDF_LENGTH_MS       500
+#if HAS_APRS
+static __pdata uint16_t ao_aprs_time;
+
+#include <ao_aprs.h>
+#endif
+
+#if defined(MEGAMETRUM)
+#define AO_SEND_MEGA   1
+#endif
 
 #if defined(TELEMETRUM_V_0_1) || defined(TELEMETRUM_V_0_2) || defined(TELEMETRUM_V_1_0) || defined(TELEMETRUM_V_1_1) || defined(TELEBALLOON_V_1_1) || defined(TELEMETRUM_V_1_2)
 #define AO_TELEMETRY_SENSOR    AO_TELEMETRY_SENSOR_TELEMETRUM
@@ -49,11 +46,12 @@ static __pdata uint16_t ao_rdf_time;
 
 static __xdata union ao_telemetry_all  telemetry;
 
+#if defined AO_TELEMETRY_SENSOR
 /* Send sensor packet */
 static void
 ao_send_sensor(void)
 {
-       __xdata struct ao_data *packet = &ao_data_ring[ao_data_ring_prev(ao_sample_data)];
+       __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_SENSOR;
@@ -64,7 +62,7 @@ ao_send_sensor(void)
 #else
        telemetry.sensor.accel = 0;
 #endif
-       telemetry.sensor.pres = packet->adc.pres;
+       telemetry.sensor.pres = ao_data_pres(packet);
        telemetry.sensor.temp = packet->adc.temp;
        telemetry.sensor.v_batt = packet->adc.v_batt;
 #if HAS_IGNITE
@@ -92,10 +90,82 @@ ao_send_sensor(void)
 
        ao_radio_send(&telemetry, sizeof (telemetry));
 }
+#endif
 
-static uint8_t         ao_baro_sample;
+
+#ifdef AO_SEND_MEGA
+/* Send mega sensor packet */
+static void
+ao_send_mega_sensor(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_MEGA_SENSOR;
+
+       telemetry.mega_sensor.accel = ao_data_accel(packet);
+       telemetry.mega_sensor.pres = ao_data_pres(packet);
+       telemetry.mega_sensor.temp = ao_data_temp(packet);
+
+#if HAS_MPU6000
+       telemetry.mega_sensor.accel_x = packet->mpu6000.accel_x;
+       telemetry.mega_sensor.accel_y = packet->mpu6000.accel_y;
+       telemetry.mega_sensor.accel_z = packet->mpu6000.accel_z;
+
+       telemetry.mega_sensor.gyro_x = packet->mpu6000.gyro_x;
+       telemetry.mega_sensor.gyro_y = packet->mpu6000.gyro_y;
+       telemetry.mega_sensor.gyro_z = packet->mpu6000.gyro_z;
+#endif
+
+#if HAS_HMC5883
+       telemetry.mega_sensor.mag_x = packet->hmc5883.x;
+       telemetry.mega_sensor.mag_y = packet->hmc5883.y;
+       telemetry.mega_sensor.mag_z = packet->hmc5883.z;
+#endif
+
+       ao_radio_send(&telemetry, sizeof (telemetry));
+}
+
+static __pdata int8_t ao_telemetry_mega_data_max;
+static __pdata int8_t ao_telemetry_mega_data_cur;
+
+/* Send mega data packet */
+static void
+ao_send_mega_data(void)
+{
+       if (--ao_telemetry_mega_data_cur <= 0) {
+               __xdata struct ao_data *packet = (__xdata struct ao_data *) &ao_data_ring[ao_data_ring_prev(ao_sample_data)];
+               uint8_t i;
+
+               telemetry.generic.tick = packet->tick;
+               telemetry.generic.type = AO_TELEMETRY_MEGA_DATA;
+
+               telemetry.mega_data.state = ao_flight_state;
+               telemetry.mega_data.v_batt = packet->adc.v_batt;
+               telemetry.mega_data.v_pyro = packet->adc.v_pbatt;
+
+               /* ADC range is 0-4095, so shift by four to save the high 8 bits */
+               for (i = 0; i < AO_ADC_NUM_SENSE; i++)
+                       telemetry.mega_data.sense[i] = packet->adc.sense[i] >> 4;
+
+               telemetry.mega_data.ground_pres = ao_ground_pres;
+               telemetry.mega_data.ground_accel = ao_ground_accel;
+               telemetry.mega_data.accel_plus_g = ao_config.accel_plus_g;
+               telemetry.mega_data.accel_minus_g = ao_config.accel_minus_g;
+
+               telemetry.mega_data.acceleration = ao_accel;
+               telemetry.mega_data.speed = ao_speed;
+               telemetry.mega_data.height = ao_height;
+
+               ao_radio_send(&telemetry, sizeof (telemetry));
+               ao_telemetry_mega_data_cur = ao_telemetry_mega_data_max;
+       }
+}
+#endif /* AO_SEND_MEGA */
 
 #ifdef AO_SEND_ALL_BARO
+static uint8_t         ao_baro_sample;
+
 static void
 ao_send_baro(void)
 {
@@ -117,6 +187,9 @@ ao_send_baro(void)
 }
 #endif
 
+static __pdata int8_t ao_telemetry_config_max;
+static __pdata int8_t ao_telemetry_config_cur;
+
 static void
 ao_send_configuration(void)
 {
@@ -142,6 +215,10 @@ ao_send_configuration(void)
 }
 
 #if HAS_GPS
+
+static __pdata int8_t ao_telemetry_loc_cur;
+static __pdata int8_t ao_telemetry_sat_cur;
+
 static void
 ao_send_location(void)
 {
@@ -177,6 +254,10 @@ ao_send_satellite(void)
 #endif
 
 #if HAS_COMPANION
+
+static __pdata int8_t ao_telemetry_companion_max;
+static __pdata int8_t ao_telemetry_companion_cur;
+
 static void
 ao_send_companion(void)
 {
@@ -213,29 +294,61 @@ ao_telemetry(void)
                while (ao_telemetry_interval == 0)
                        ao_sleep(&telemetry);
                time = ao_rdf_time = ao_time();
+#if HAS_APRS
+               ao_aprs_time = time;
+#endif
                while (ao_telemetry_interval) {
 
-
+#if HAS_APRS
+                       if (!(ao_config.radio_enable & AO_RADIO_DISABLE_TELEMETRY))
+#endif
+                       {
 #ifdef AO_SEND_ALL_BARO
-                       ao_send_baro();
+                               ao_send_baro();
+#endif
+#ifdef AO_SEND_MEGA
+                               ao_send_mega_sensor();
+                               ao_send_mega_data();
+#else
+                               ao_send_sensor();
 #endif
-                       ao_send_sensor();
+
 #if HAS_COMPANION
-                       if (ao_companion_running)
-                               ao_send_companion();
+                               if (ao_companion_running)
+                                       ao_send_companion();
 #endif
-                       ao_send_configuration();
+                               ao_send_configuration();
 #if HAS_GPS
-                       ao_send_location();
-                       ao_send_satellite();
+                               ao_send_location();
+                               ao_send_satellite();
 #endif
+                       }
 #ifndef AO_SEND_ALL_BARO
                        if (ao_rdf &&
+#if HAS_APRS
+                           !(ao_config.radio_enable & AO_RADIO_DISABLE_RDF) &&
+#endif
                            (int16_t) (ao_time() - ao_rdf_time) >= 0)
                        {
+#if HAS_IGNITE_REPORT
+                               uint8_t c;
+#endif
                                ao_rdf_time = ao_time() + AO_RDF_INTERVAL_TICKS;
-                               ao_radio_rdf(AO_MS_TO_RDF_LEN(AO_RDF_LENGTH_MS));
+#if HAS_IGNITE_REPORT
+                               if (ao_flight_state == ao_flight_pad && (c = ao_report_igniter()))
+                                       ao_radio_continuity(c);
+                               else
+#endif
+                                       ao_radio_rdf();
+                       }
+#if HAS_APRS
+                       if (ao_config.aprs_interval != 0 &&
+                           (int16_t) (ao_time() - ao_aprs_time) >= 0)
+                       {
+                               ao_aprs_time = ao_time() + AO_SEC_TO_TICKS(ao_config.aprs_interval);
+                               ao_aprs_send();
                        }
+#endif
 #endif
                        time += ao_telemetry_interval;
                        delay = time - ao_time();
@@ -246,6 +359,7 @@ ao_telemetry(void)
                        }
                        else
                                time = ao_time();
+               bottom: ;
                }
        }
 }
@@ -253,31 +367,42 @@ ao_telemetry(void)
 void
 ao_telemetry_set_interval(uint16_t interval)
 {
+       int8_t  cur = 0;
        ao_telemetry_interval = interval;
+       
+#if AO_SEND_MEGA
+       if (interval > 1)
+               ao_telemetry_mega_data_max = 1;
+       else
+               ao_telemetry_mega_data_max = 2;
+       if (ao_telemetry_mega_data_max > cur)
+               cur++;
+       ao_telemetry_mega_data_cur = cur;
+#endif
 
 #if HAS_COMPANION
        if (!ao_companion_setup.update_period)
                ao_companion_setup.update_period = AO_SEC_TO_TICKS(1);
        ao_telemetry_companion_max = ao_companion_setup.update_period / interval;
-       ao_telemetry_companion_cur = 1;
+       if (ao_telemetry_companion_max > cur)
+               cur++;
+       ao_telemetry_companion_cur = cur;
 #endif
 
        ao_telemetry_config_max = AO_SEC_TO_TICKS(1) / interval;
 #if HAS_COMPANION
-       ao_telemetry_config_cur = ao_telemetry_companion_cur;
-       if (ao_telemetry_config_max > ao_telemetry_config_cur)
-               ao_telemetry_config_cur++;
-#else
-       ao_telemetry_config_cur = 1;
+       if (ao_telemetry_config_max > cur)
+               cur++;
+       ao_telemetry_config_cur = cur;
 #endif
 
 #if HAS_GPS
-       ao_telemetry_loc_cur = ao_telemetry_config_cur;
-       if (ao_telemetry_config_max > ao_telemetry_loc_cur)
-               ao_telemetry_loc_cur++;
-       ao_telemetry_sat_cur = ao_telemetry_loc_cur;
-       if (ao_telemetry_config_max > ao_telemetry_sat_cur)
-               ao_telemetry_sat_cur++;
+       if (ao_telemetry_config_max > cur)
+               cur++;
+       ao_telemetry_loc_cur = cur;
+       if (ao_telemetry_config_max > cur)
+               cur++;
+       ao_telemetry_sat_cur = cur;
 #endif
        ao_wakeup(&telemetry);
 }
@@ -288,8 +413,9 @@ ao_rdf_set(uint8_t rdf)
        ao_rdf = rdf;
        if (rdf == 0)
                ao_radio_rdf_abort();
-       else
+       else {
                ao_rdf_time = ao_time() + AO_RDF_INTERVAL_TICKS;
+       }
 }
 
 __xdata struct ao_task ao_telemetry_task;