X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=aoview%2Faoview_monitor.c;h=e2ba75bab0f8f9d92e7a3c47fe43ad697aca3c6b;hb=8cce307bb3156584ba17ae5a787f645dfee5fb94;hp=b0189c60698d2777935596773f2ae1054c8f6123;hpb=7cb9fb675f56bf30ab6bf0bcdc5cb679709ffe3e;p=fw%2Faltos

diff --git a/aoview/aoview_monitor.c b/aoview/aoview_monitor.c
index b0189c60..e2ba75ba 100644
--- a/aoview/aoview_monitor.c
+++ b/aoview/aoview_monitor.c
@@ -82,14 +82,13 @@ aoview_monitor_parse(char *line)
 		if (words[nword] == NULL)
 			break;
 	}
-	if (nword < 32)
+	if (nword < 36)
 		return;
 	if (strcmp(words[0], "CALL") != 0)
 		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]);
@@ -101,15 +100,17 @@ aoview_monitor_parse(char *line)
 	aoview_parse_int(&state.drogue, words[20]);
 	aoview_parse_int(&state.main, words[22]);
 	aoview_parse_int(&state.flight_accel, words[24]);
-	aoview_parse_int(&state.flight_vel, words[26]);
-	aoview_parse_int(&state.flight_pres, words[28]);
-	aoview_parse_int(&state.nsat, words[30]);
-	if (strcmp (words[32], "unlocked") != 0 && nword >= 35) {
+	aoview_parse_int(&state.ground_accel, words[26]);
+	aoview_parse_int(&state.flight_vel, words[28]);
+	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 >= 40) {
 		state.locked = 1;
-		sscanf(words[32], "%d:%d:%d", &state.gps_time.hour, &state.gps_time.minute, &state.gps_time.second);
-		aoview_parse_pos(&state.lat, words[33]);
-		aoview_parse_pos(&state.lon, words[34]);
-		sscanf(words[35], "%dm", &state.alt);
+		sscanf(words[36], "%d:%d:%d", &state.gps_time.hour, &state.gps_time.minute, &state.gps_time.second);
+		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;