Make menu seperator insensitive
[fw/altos] / aoview / aoview_monitor.c
index 7a04c82f88a653e31d32f189ab9104bda94c0a33..e2ba75bab0f8f9d92e7a3c47fe43ad697aca3c6b 100644 (file)
@@ -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,12 +105,12 @@ 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;