X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosState.java;h=59a1999e693d20b59514ebb79e04f9f1e151e850;hb=ce90f3fe2aa6e23695ccccb36a8e6e614a08ba31;hp=aacddfdf5ee3f80e66f13e6be85d8f1b11fe071a;hpb=9cc48698ec14c34d437baad7b6540edc31e9741c;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosState.java b/ao-tools/altosui/AltosState.java
index aacddfdf..59a1999e 100644
--- a/ao-tools/altosui/AltosState.java
+++ b/ao-tools/altosui/AltosState.java
@@ -29,7 +29,7 @@ public class AltosState {
 
 	/* derived data */
 
-	double  report_time;
+	long  	report_time;
 
 	double	time_change;
 	int	tick;
@@ -66,11 +66,6 @@ public class AltosState {
 	int	speak_tick;
 	double	speak_altitude;
 
-	static double
-	aoview_time()
-	{
-		return System.currentTimeMillis() / 1000.0;
-	}
 
 	void init (AltosTelemetry cur, AltosState prev_state) {
 		int		i;
@@ -82,7 +77,7 @@ public class AltosState {
 		ground_altitude = AltosConvert.cc_barometer_to_altitude(data.ground_pres);
 		height = AltosConvert.cc_barometer_to_altitude(data.flight_pres) - ground_altitude;
 
-		report_time = aoview_time();
+		report_time = System.currentTimeMillis();
 
 		accel_counts_per_mss = ((data.accel_minus_g - data.accel_plus_g) / 2.0) / 9.80665;
 		acceleration = (data.ground_accel - data.flight_accel) / accel_counts_per_mss;
@@ -102,6 +97,9 @@ public class AltosState {
 			pad_lat = prev_state.pad_lat;
 			pad_lon = prev_state.pad_lon;
 			pad_alt = prev_state.pad_alt;
+			max_height = prev_state.max_height;
+			max_acceleration = prev_state.max_acceleration;
+			max_speed = prev_state.max_speed;
 
 			/* make sure the clock is monotonic */
 			while (tick < prev_state.tick)