X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-view%2Faoview_state.c;h=505bcddcb1477487735d5f459c76f07a46cf2819;hp=2f613d44c835c2f29893d22cf3f9bd253490e99f;hb=9856b7c4397afcecc8f541af9a83824e817b3612;hpb=3ee279ba76c2a79d142c466f19ef758cf4c01d70

diff --git a/ao-tools/ao-view/aoview_state.c b/ao-tools/ao-view/aoview_state.c
index 2f613d44..505bcddc 100644
--- a/ao-tools/ao-view/aoview_state.c
+++ b/ao-tools/ao-view/aoview_state.c
@@ -127,10 +127,10 @@ aoview_state_derive(struct cc_telem *data, struct aostate *state)
 	accel_counts_per_mss = ((data->accel_minus_g - data->accel_plus_g) / 2.0) / 9.80665;
 	state->acceleration = (data->ground_accel - data->flight_accel) / accel_counts_per_mss;
 	state->speed = data->flight_vel / (accel_counts_per_mss * 100.0);
-	state->temperature = ((data->temp / 32767.0 * 3.3) - 0.5) / 0.01;
-	state->drogue_sense = data->drogue / 32767.0 * 15.0;
-	state->main_sense = data->main / 32767.0 * 15.0;
-	state->battery = data->batt / 32767.0 * 5.0;
+	state->temperature = cc_thermometer_to_temperature(data->temp);
+	state->drogue_sense = cc_ignitor_to_voltage(data->drogue);
+	state->main_sense = cc_ignitor_to_voltage(data->main);
+	state->battery = cc_battery_to_voltage(data->batt);
 	if (!strcmp(data->state, "pad")) {
 		if (data->gps.gps_locked && data->gps.nsat >= 4) {
 			state->npad++;
@@ -315,6 +315,10 @@ aoview_state_notify(struct cc_telem *data)
 		aoview_state_add_deg(1, "Longitude", state->gps.lon, 'E', 'W');
 		aoview_table_add_row(1, "GPS altitude", "%d", state->gps.alt);
 		aoview_table_add_row(1, "GPS height", "%d", state->gps_height);
+		aoview_table_add_row(1, "GPS date", "%04d-%02d-%02d",
+				     state->gps.gps_time.year,
+				     state->gps.gps_time.month,
+				     state->gps.gps_time.day);
 		aoview_table_add_row(1, "GPS time", "%02d:%02d:%02d",
 				     state->gps.gps_time.hour,
 				     state->gps.gps_time.minute,
@@ -338,23 +342,14 @@ aoview_state_notify(struct cc_telem *data)
 	}
 	if (state->gps.gps_connected) {
 		int	nsat_vis = 0;
-		int	nsat_locked = 0;
 		int	c;
 
-		for (c = 0; c < state->gps_tracking.channels; c++) {
-			if ((state->gps_tracking.sats[c].state & 0xff) == 0xbf)
-				nsat_locked++;
-		}
 		aoview_table_add_row(2, "Satellites Visible", "%d", state->gps_tracking.channels);
-		aoview_table_add_row(2, "Satellites Locked", "%d", nsat_locked);
 		for (c = 0; c < state->gps_tracking.channels; c++) {
-			aoview_table_add_row(2, "Satellite id,state,C/N0",
-					     "%3d,%02x,%2d%s",
+			aoview_table_add_row(2, "Satellite id,C/N0",
+					     "%3d,%2d",
 					     state->gps_tracking.sats[c].svid,
-					     state->gps_tracking.sats[c].state,
-					     state->gps_tracking.sats[c].c_n0,
-					     (state->gps_tracking.sats[c].state & 0xff) == 0xbf ?
-					     " LOCKED" : "");
+					     state->gps_tracking.sats[c].c_n0);
 		}
 	}
 	aoview_table_finish();