if (words[nword] == NULL)
break;
}
- if (nword < 26)
+ 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]);
aoview_parse_int(&state.batt, words[18]);
aoview_parse_int(&state.drogue, words[20]);
aoview_parse_int(&state.main, words[22]);
- aoview_parse_int(&state.nsat, words[24]);
- if (strcmp (words[26], "unlocked") != 0 && nword >= 29) {
+ aoview_parse_int(&state.flight_accel, words[24]);
+ 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[26], "%d:%d:%d", &state.gps_time.hour, &state.gps_time.minute, &state.gps_time.second);
- aoview_parse_pos(&state.lat, words[27]);
- aoview_parse_pos(&state.lon, words[28]);
- sscanf(words[29], "%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;
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);
}