- NUM_PAD_SAMPLES - npad_gps);
- aoview_table_add_row("Rocket state", "%s", state->state);
- aoview_table_add_row("Callsign", "%s", state->callsign);
- aoview_table_add_row("Rocket serial", "%d", state->serial);
-
- aoview_table_add_row("RSSI", "%ddBm", state->rssi);
- aoview_table_add_row("Height", "%dm", altitude);
- aoview_table_add_row("Max height", "%dm",
- aoview_pres_to_altitude(min_pres) -
- aoview_pres_to_altitude(state->ground_pres));
- aoview_table_add_row("Acceleration", "%gm/s²", accel);
- aoview_table_add_row("Max acceleration", "%gm/s²", max_accel);
- aoview_table_add_row("Velocity", "%gm/s", velocity);
- aoview_table_add_row("Temperature", "%g°C", temp);
- aoview_table_add_row("Battery", "%gV", battery);
- aoview_table_add_row("Drogue", "%gV", drogue_sense);
- aoview_table_add_row("Main", "%gV", main_sense);
- aoview_table_add_row("Pad altitude", "%dm", aoview_pres_to_altitude(state->ground_pres));
- aoview_table_add_row("Satellites", "%d", state->nsat);
- if (state->locked) {
- aoview_state_add_deg("Latitude", state->lat, 'N', 'S');
- aoview_state_add_deg("Longitude", state->lon, 'E', 'W');
- aoview_table_add_row("GPS alt", "%d", state->alt);
+ MIN_PAD_SAMPLES - state->npad);
+ aoview_table_add_row("Rocket state", "%s", state->data.state);
+ aoview_table_add_row("Callsign", "%s", state->data.callsign);
+ aoview_table_add_row("Rocket serial", "%d", state->data.serial);
+
+ aoview_table_add_row("RSSI", "%6ddBm", state->data.rssi);
+ aoview_table_add_row("Height", "%6dm", state->height);
+ aoview_table_add_row("Max height", "%6dm", state->max_height);
+ aoview_table_add_row("Acceleration", "%7.1fm/s²", state->acceleration);
+ aoview_table_add_row("Max acceleration", "%7.1fm/s²", state->max_acceleration);
+ aoview_table_add_row("Speed", "%7.1fm/s", state->ascent ? state->speed : state->baro_speed);
+ aoview_table_add_row("Max Speed", "%7.1fm/s", state->max_speed);
+ aoview_table_add_row("Temperature", "%6.2f°C", state->temperature);
+ aoview_table_add_row("Battery", "%5.2fV", state->battery);
+ aoview_table_add_row("Drogue", "%5.2fV", state->drogue_sense);
+ aoview_table_add_row("Main", "%5.2fV", state->main_sense);
+ aoview_table_add_row("Pad altitude", "%dm", state->ground_altitude);
+ aoview_table_add_row("Satellites", "%d", state->data.nsat);
+ if (state->data.locked) {
+ aoview_state_add_deg("Latitude", state->data.lat, 'N', 'S');
+ aoview_state_add_deg("Longitude", state->data.lon, 'E', 'W');
+ aoview_table_add_row("GPS height", "%d", state->gps_height);