altos: Massive product config cleanup

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

diff --git a/src/core/ao_log_telem.c b/src/core/ao_log_telem.c
index 9afa13b21abd9c6bd83a4995a8eba62c552ffc80..18ab85dd4fd5b9ab1aee3409784b8db165b43eb9 100644 (file)
--- a/src/core/ao_log_telem.c
+++ b/src/core/ao_log_telem.c
@@ -15,13 +15,17 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "ao.h"
+#include <ao.h>
+#include <ao_flight.h>
+#include <ao_sample.h>
 
 __code uint8_t ao_log_format = AO_LOG_FORMAT_TELEMETRY;
 
 static __data uint8_t                  ao_log_monitor_pos;
 __pdata enum ao_flight_state           ao_flight_state;
 __pdata int16_t                                ao_max_height;  /* max of ao_height */
+__pdata int16_t                                sense_d, sense_m;
+__pdata uint8_t                                ao_igniter_present;
 
 static void
 ao_log_telem_track() {
@@ -29,7 +33,15 @@ ao_log_telem_track() {
                switch (ao_log_single_write_data.telemetry.generic.type) {
                case AO_TELEMETRY_SENSOR_TELEMETRUM:
                case AO_TELEMETRY_SENSOR_TELEMINI:
+                       /* fall through ... */
                case AO_TELEMETRY_SENSOR_TELENANO:
+                       if (ao_log_single_write_data.telemetry.generic.type == AO_TELEMETRY_SENSOR_TELENANO) {
+                               ao_igniter_present = 0;
+                       } else {
+                               sense_d = ao_log_single_write_data.telemetry.sensor.sense_d;
+                               sense_m = ao_log_single_write_data.telemetry.sensor.sense_m;
+                               ao_igniter_present = 1;
+                       }
                        if (ao_log_single_write_data.telemetry.sensor.height > ao_max_height) {
                                ao_max_height = ao_log_single_write_data.telemetry.sensor.height;
                        }
@@ -42,6 +54,31 @@ ao_log_telem_track() {
                }
        }
 }
+
+enum ao_igniter_status
+ao_igniter_status(enum ao_igniter igniter)
+{
+       int16_t value;
+
+       switch (igniter) {
+       case ao_igniter_drogue:
+               value = sense_d;
+               break;
+       case ao_igniter_main:
+               value = sense_m;
+               break;
+       default:
+               value = 0;
+               break;
+       }
+       if (value < AO_IGNITER_OPEN)
+               return ao_igniter_open;
+       else if (value > AO_IGNITER_CLOSED)
+               return ao_igniter_ready;
+       else
+               return ao_igniter_unknown;
+}
+
 void
 ao_log_single(void)
 {
@@ -55,6 +92,8 @@ ao_log_single(void)
        ao_log_running = 1;
        ao_log_single_restart();
        ao_flight_state = ao_flight_startup;
+       ao_monitor_set(sizeof(struct ao_telemetry_generic));
+
        for (;;) {
                while (!ao_log_running)
                        ao_sleep(&ao_log_running);