Add GPS speed and error data to telemetry and aoview

[fw/altos] / aoview / aoview_monitor.c

diff --git a/aoview/aoview_monitor.c b/aoview/aoview_monitor.c
index 7a04c82f88a653e31d32f189ab9104bda94c0a33..d01ca77160993bcd154b683f3ebb9fc1faa40530 100644 (file)
--- a/aoview/aoview_monitor.c
+++ b/aoview/aoview_monitor.c
@@ -88,8 +88,7 @@ aoview_monitor_parse(char *line)
                return;
        aoview_parse_string(state.callsign, sizeof (state.callsign), words[1]);
        aoview_parse_int(&state.serial, words[3]);
-       if (!aoview_log_get_serial())
-               aoview_log_set_serial(state.serial);
+       aoview_log_set_serial(state.serial);
 
        aoview_parse_int(&state.rssi, words[5]);
        aoview_parse_string(state.state, sizeof (state.state), words[9]);
@@ -106,18 +105,33 @@ aoview_monitor_parse(char *line)
        aoview_parse_int(&state.flight_pres, words[30]);
        aoview_parse_int(&state.ground_pres, words[32]);
        aoview_parse_int(&state.nsat, words[34]);
-       if (strcmp (words[36], "unlocked") != 0 && nword >= 41) {
+       if (strcmp (words[36], "unlocked") != 0 && nword >= 40) {
                state.locked = 1;
                sscanf(words[36], "%d:%d:%d", &state.gps_time.hour, &state.gps_time.minute, &state.gps_time.second);
-               aoview_parse_pos(&state.lat, words[39]);
-               aoview_parse_pos(&state.lon, words[40]);
-               sscanf(words[41], "%dm", &state.alt);
+               aoview_parse_pos(&state.lat, words[37]);
+               aoview_parse_pos(&state.lon, words[38]);
+               sscanf(words[39], "%dm", &state.alt);
        } else {
                state.locked = 0;
                state.gps_time.hour = state.gps_time.minute = state.gps_time.second = 0;
                state.lat = state.lon = 0;
                state.alt = 0;
        }
+       if (nword >= 46) {
+               sscanf(words[40], "%lfm/s", &state.ground_speed);
+               sscanf(words[41], "%d", &state.course);
+               sscanf(words[42], "%lfm/s", &state.climb_rate);
+               sscanf(words[43], "%lf", &state.hdop);
+               sscanf(words[44], "%d", &state.h_error);
+               sscanf(words[45], "%d", &state.v_error);
+       } else {
+               state.ground_speed = 0;
+               state.course = 0;
+               state.climb_rate = 0;
+               state.hdop = 0;
+               state.h_error = 0;
+               state.v_error = 0;
+       }
        aoview_state_notify(&state);
 }