Make sure full log is written and flushed on landing.

[fw/altos] / ao_log.c

diff --git a/ao_log.c b/ao_log.c
index 65196ae25f17bdac47075b2c7a6910ee13e3fd3e..bcd852c0bc5089780eb5fa38889575c592f11757 100644 (file)
--- a/ao_log.c
+++ b/ao_log.c
@@ -3,8 +3,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,10 +17,10 @@
 
 #include "ao.h"
 
-__data uint32_t                ao_log_current_pos;
-__data uint32_t                ao_log_start_pos;
-__xdata uint8_t                ao_log_running;
-__xdata uint8_t                ao_log_mutex;
+static __pdata uint32_t        ao_log_current_pos;
+static __pdata uint32_t        ao_log_start_pos;
+static __xdata uint8_t ao_log_running;
+static __xdata uint8_t ao_log_mutex;
 
 static uint8_t
 ao_log_csum(uint8_t *b)
@@ -121,20 +120,14 @@ ao_log(void)
                ao_sleep(&ao_log_running);
        
        log.type = AO_LOG_FLIGHT;
-       log.tick = ao_flight_state_tick;
+       log.tick = ao_flight_tick;
        log.u.flight.serial = 0;
        log.u.flight.flight = ao_log_dump_flight + 1;
        ao_log_data(&log);
        for (;;) {
-               /* Write state change to EEPROM */
-               if (ao_flight_state != ao_log_state) {
-                       ao_log_state = ao_flight_state;
-                       log.type = AO_LOG_STATE;
-                       log.tick = ao_flight_state_tick;
-                       log.u.state.state = ao_log_state;
-                       log.u.state.reason = 0;
-                       ao_log_data(&log);
-               }
+               while (!ao_log_running)
+                       ao_sleep(&ao_log_running);
+
                /* Write samples to EEPROM */
                while (ao_log_adc_pos != ao_adc_head) {
                        log.type = AO_LOG_SENSOR;
@@ -142,7 +135,7 @@ ao_log(void)
                        log.u.sensor.accel = ao_adc_ring[ao_log_adc_pos].accel;
                        log.u.sensor.pres = ao_adc_ring[ao_log_adc_pos].pres;
                        ao_log_data(&log);
-                       if (ao_log_adc_pos == 0) {
+                       if ((ao_log_adc_pos & 0x1f) == 0) {
                                log.type = AO_LOG_TEMP_VOLT;
                                log.tick = ao_adc_ring[ao_log_adc_pos].tick;
                                log.u.temp_volt.temp = ao_adc_ring[ao_log_adc_pos].temp;
@@ -154,9 +147,19 @@ ao_log(void)
                                log.u.deploy.main = ao_adc_ring[ao_log_adc_pos].sense_m;
                                ao_log_data(&log);
                        }
-                       ao_log_adc_pos++;
-                       if (ao_log_adc_pos == AO_ADC_RING)
-                               ao_log_adc_pos = 0;
+                       ao_log_adc_pos = ao_adc_ring_next(ao_log_adc_pos);
+               }
+               /* Write state change to EEPROM */
+               if (ao_flight_state != ao_log_state) {
+                       ao_log_state = ao_flight_state;
+                       log.type = AO_LOG_STATE;
+                       log.tick = ao_flight_tick;
+                       log.u.state.state = ao_log_state;
+                       log.u.state.reason = 0;
+                       ao_log_data(&log);
+
+                       if (ao_log_state == ao_flight_landed)
+                               ao_log_stop();
                }
                
                /* Wait for a while */
@@ -172,6 +175,32 @@ ao_log_start(void)
        ao_wakeup(&ao_log_running);
 }
 
+void
+ao_log_stop(void)
+{
+       ao_log_running = 0;
+       ao_log_flush();
+}
+
+static void
+dump_log(void)
+{
+       __xdata uint8_t more;
+
+       for (more = ao_log_dump_first(); more; more = ao_log_dump_next()) {
+               printf("%c %4x %4x %4x\n",
+                      ao_log_dump.type,
+                      ao_log_dump.tick,
+                      ao_log_dump.u.anon.d0,
+                      ao_log_dump.u.anon.d1);
+       }
+}
+
+__code struct ao_cmds ao_log_cmds[] = {
+       { 'l',  dump_log,               "l                                  Dump last flight log" },
+       { 0, dump_log, NULL },
+};
+
 static __xdata struct ao_task ao_log_task;
 
 void
@@ -185,5 +214,6 @@ ao_log_init(void)
        ao_log_state = ao_flight_invalid;
 
        /* Create a task to log events to eeprom */
-       ao_add_task(&ao_log_task, ao_log);
+       ao_add_task(&ao_log_task, ao_log, "log");
+       ao_cmd_register(&ao_log_cmds[0]);
 }