diff options
Diffstat (limited to 'aoview/aoview_monitor.c')
| -rw-r--r-- | aoview/aoview_monitor.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/aoview/aoview_monitor.c b/aoview/aoview_monitor.c index b0189c60..7a04c82f 100644 --- a/aoview/aoview_monitor.c +++ b/aoview/aoview_monitor.c @@ -82,7 +82,7 @@ aoview_monitor_parse(char *line) if (words[nword] == NULL) break; } - if (nword < 32) + if (nword < 36) return; if (strcmp(words[0], "CALL") != 0) return; @@ -101,15 +101,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 >= 41) { 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[39]); + aoview_parse_pos(&state.lon, words[40]); + sscanf(words[41], "%dm", &state.alt); } else { state.locked = 0; state.gps_time.hour = state.gps_time.minute = state.gps_time.second = 0; |