Add GPS date/time output to ao-postflight.

[fw/altos] / ao-tools / lib / cc-logfile.c

diff --git a/ao-tools/lib/cc-logfile.c b/ao-tools/lib/cc-logfile.c
index 444ff0892ebd195236dc9719592f8c1575dcc865..b0fff9f8c0ea7f01d0be54449b1ff77cbead2c70 100644 (file)
--- a/ao-tools/lib/cc-logfile.c
+++ b/ao-tools/lib/cc-logfile.c
@@ -18,6 +18,7 @@
 #include "cc.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 static int
 timedata_add(struct cc_timedata *data, double time, double value)
@@ -35,8 +36,11 @@ timedata_add(struct cc_timedata *data, double time, double value)
                data->size = newsize;
                data->data = newdata;
        }
-       if (data->num && data->data[data->num-1].time > time)
+       time += data->time_offset;
+       if (data->num && data->data[data->num-1].time > time) {
+               data->time_offset += 65536;
                time += 65536;
+       }
        data->data[data->num].time = time;
        data->data[data->num].value = value;
        data->num++;
@@ -66,11 +70,55 @@ gpsdata_add(struct cc_gpsdata *data, struct cc_gpselt *elt)
                data->size = newsize;
                data->data = newdata;
        }
+       elt->time += data->time_offset;
+       if (data->num && data->data[data->num-1].time > elt->time) {
+               data->time_offset += 65536;
+               elt->time += 65536;
+       }
        data->data[data->num] = *elt;
        data->num++;
        return 1;
 }
 
+static int
+gpssat_add(struct cc_gpsdata *data, struct cc_gpssat *sat)
+{
+       int     i, j;
+       int     reuse = 0;
+       int     newsizesats;
+       struct cc_gpssats       *newsats;
+
+       for (i = data->numsats; --i >= 0;) {
+               if (data->sats[i].sat[0].time == sat->time) {
+                       reuse = 1;
+                       break;
+               }
+               if (data->sats[i].sat[0].time < sat->time)
+                       break;
+       }
+       if (!reuse) {
+               if (data->numsats == data->sizesats) {
+                       if (data->sizesats == 0)
+                               newsats = malloc((newsizesats = 256) * sizeof (struct cc_gpssats));
+                       else
+                               newsats = realloc (data->sats, (newsizesats = data->sizesats * 2)
+                                                  * sizeof (struct cc_gpssats));
+                       if (!newsats)
+                               return 0;
+                       data->sats = newsats;
+                       data->sizesats = newsizesats;
+               }
+               i = data->numsats++;
+               data->sats[i].nsat = 0;
+       }
+       j = data->sats[i].nsat;
+       if (j < 12) {
+               data->sats[i].sat[j] = *sat;
+               data->sats[i].nsat = j + 1;
+       }
+       return 1;
+}
+
 static void
 gpsdata_free(struct cc_gpsdata *data)
 {
@@ -88,16 +136,24 @@ gpsdata_free(struct cc_gpsdata *data)
 #define AO_LOG_GPS_LON         'W'
 #define AO_LOG_GPS_ALT         'H'
 #define AO_LOG_GPS_SAT         'V'
+#define AO_LOG_GPS_DATE                'Y'
 
 #define AO_LOG_POS_NONE                (~0UL)
 
+#define GPS_TIME       1
+#define GPS_LAT                2
+#define GPS_LON                4
+#define GPS_ALT                8
+
 static int
 read_eeprom(const char *line, struct cc_flightraw *f, double *ground_pres, int *ground_pres_count)
 {
        char    type;
        int     tick;
        int     a, b;
-       struct cc_gpselt        gps;
+       static struct cc_gpselt gps;
+       static int              gps_valid;
+       struct cc_gpssat        sat;
        int     serial;
 
        if (sscanf(line, "serial-number %u", &serial) == 1) {
@@ -136,26 +192,72 @@ read_eeprom(const char *line, struct cc_flightraw *f, double *ground_pres, int *
                timedata_add(&f->state, tick, a);
                break;
        case AO_LOG_GPS_TIME:
+               /* the flight computer writes TIME first, so reset
+                * any stale data before adding this record
+                */
                gps.time = tick;
+               gps.hour = (a & 0xff);
+               gps.minute = (a >> 8) & 0xff;
+               gps.second = (b & 0xff);
+               gps.flags = (b >> 8) & 0xff;
+               gps_valid = GPS_TIME;
                break;
        case AO_LOG_GPS_LAT:
                gps.lat = ((int32_t) (a + (b << 16))) / 10000000.0;
+               gps_valid |= GPS_LAT;
                break;
        case AO_LOG_GPS_LON:
                gps.lon = ((int32_t) (a + (b << 16))) / 10000000.0;
+               gps_valid |= GPS_LON;
                break;
        case AO_LOG_GPS_ALT:
-               gps.alt = ((int32_t) (a + (b << 16)));
-               gpsdata_add(&f->gps, &gps);
+               gps.alt = (int16_t) a;
+               gps_valid |= GPS_ALT;
                break;
        case AO_LOG_GPS_SAT:
+               sat.time = tick;
+               sat.svid = a;
+               sat.c_n = (b >> 8) & 0xff;
+               gpssat_add(&f->gps, &sat);
+               break;
+       case AO_LOG_GPS_DATE:
+               f->year = 2000 + (a & 0xff);
+               f->month = (a >> 8) & 0xff;
+               f->day = (b & 0xff);
                break;
        default:
                return 0;
        }
+       if (gps_valid == 0xf) {
+               gps_valid = 0;
+               gpsdata_add(&f->gps, &gps);
+       }
        return 1;
 }
 
+static const char *state_names[] = {
+       "startup",
+       "idle",
+       "pad",
+       "boost",
+       "fast",
+       "coast",
+       "drogue",
+       "main",
+       "landed",
+       "invalid"
+};
+
+static enum ao_flight_state
+state_name_to_state(char *state_name)
+{
+       enum ao_flight_state    state;
+       for (state = ao_flight_startup; state < ao_flight_invalid; state++)
+               if (!strcmp(state_names[state], state_name))
+                       return state;
+       return ao_flight_invalid;
+}
+
 static int
 read_telem(const char *line, struct cc_flightraw *f)
 {
@@ -172,11 +274,18 @@ read_telem(const char *line, struct cc_flightraw *f)
        timedata_add(&f->volt, telem.tick, telem.batt);
        timedata_add(&f->drogue, telem.tick, telem.drogue);
        timedata_add(&f->main, telem.tick, telem.main);
+       timedata_add(&f->state, telem.tick, state_name_to_state(telem.state));
        if (telem.gps.gps_locked) {
+               f->year = telem.gps.gps_time.year;
+               f->month = telem.gps.gps_time.month;
+               f->day = telem.gps.gps_time.day;
                gps.time = telem.tick;
                gps.lat = telem.gps.lat;
                gps.lon = telem.gps.lon;
                gps.alt = telem.gps.alt;
+               gps.hour = telem.gps.gps_time.hour;
+               gps.minute = telem.gps.gps_time.minute;
+               gps.second = telem.gps.gps_time.second;
                gpsdata_add(&f->gps, &gps);
        }
        return 1;