X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-view%2Faoview_state.c;h=f8f0168546a7b5b488c370940226d2fa2aabd8b6;hp=f75066dde24d64b5100f2d7d00481e660d9a4d82;hb=1de322b960005c9a16051afa1881fadb00f4bcd6;hpb=b529e5e8998702986909111a457f3ce9932e1ccf

diff --git a/ao-tools/ao-view/aoview_state.c b/ao-tools/ao-view/aoview_state.c
index f75066dd..f8f01685 100644
--- a/ao-tools/ao-view/aoview_state.c
+++ b/ao-tools/ao-view/aoview_state.c
@@ -105,6 +105,7 @@ aoview_state_derive(struct aodata *data, struct aostate *state)
 	double	new_height;
 	double	height_change;
 	double	time_change;
+	double	accel_counts_per_mss;
 	int	tick_count;
 
 	state->report_time = aoview_time();
@@ -123,8 +124,9 @@ aoview_state_derive(struct aodata *data, struct aostate *state)
 	state->height = new_height;
 	if (time_change)
 		state->baro_speed = (state->baro_speed * 3 + (height_change / time_change)) / 4.0;
-	state->acceleration = (data->ground_accel - data->flight_accel) / 27.0;
-	state->speed = data->flight_vel / 2700.0;
+	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;