X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosCalData.java;h=cb58e4929c3056ada5af4db3b6249d53a9e16932;hp=3da0e4009f5da00480cf786c42877a84e7d58552;hb=78b4bf77fca96bef2cce443ad4c9544ae83f0acc;hpb=222158581887b5f9e8b9843d14321c313fa023fa

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index 3da0e400..cb58e492 100644
--- a/altoslib/AltosCalData.java
+++ b/altoslib/AltosCalData.java
@@ -65,8 +65,11 @@ public class AltosCalData {
 	public int		device_type = AltosLib.MISSING;
 
 	public void set_device_type(int device_type) {
-		if (device_type != AltosLib.MISSING)
+		if (device_type != AltosLib.MISSING) {
 			this.device_type = device_type;
+			if (product == null)
+				set_product(AltosLib.product_name(device_type));
+		}
 	}
 
 	public int		config_major = AltosLib.MISSING;
@@ -98,6 +101,8 @@ public class AltosCalData {
 
 	public void set_accel_plus_minus(double plus, double minus) {
 		if (plus != AltosLib.MISSING && minus != AltosLib.MISSING) {
+			if (plus == minus)
+				return;
 			accel_plus_g = plus;
 			accel_minus_g = minus;
 		}
@@ -172,28 +177,47 @@ public class AltosCalData {
 					tick += 65536;
 				}
 			}
+			prev_tick = tick;
 			this.tick = tick;
 		}
 	}
 
+	/* Reset all values which change during flight
+	 */
+	public void reset() {
+		state = AltosLib.MISSING;
+		tick = AltosLib.MISSING;
+		prev_tick = AltosLib.MISSING;
+		temp_gps = null;
+		prev_gps = null;
+		temp_gps_sat_tick = AltosLib.MISSING;
+		accel = AltosLib.MISSING;
+	}
+
 	public int		boost_tick = AltosLib.MISSING;
 
 	public void set_boost_tick() {
 		boost_tick = tick;
 	}
 
+	public double		ticks_per_sec = 100.0;
+
+	public void set_ticks_per_sec(double ticks_per_sec) {
+		this.ticks_per_sec = ticks_per_sec;
+	}
+
 	public double time() {
 		if (tick == AltosLib.MISSING)
 			return AltosLib.MISSING;
 		if (boost_tick == AltosLib.MISSING)
 			return AltosLib.MISSING;
-		return (tick - boost_tick) / 100.0;
+		return (tick - boost_tick) / ticks_per_sec;
 	}
 
 	public double boost_time() {
 		if (boost_tick == AltosLib.MISSING)
 			return AltosLib.MISSING;
-		return boost_tick / 100.0;
+		return boost_tick / ticks_per_sec;
 	}
 
 	public int		state = AltosLib.MISSING;
@@ -206,9 +230,13 @@ public class AltosCalData {
 
 	public AltosGPS		gps_pad = null;
 
+	public double		gps_pad_altitude = AltosLib.MISSING;
+
 	public void set_gps(AltosGPS gps) {
 		if ((state != AltosLib.MISSING && state < AltosLib.ao_flight_boost) || gps_pad == null)
 			gps_pad = gps;
+		if (gps_pad_altitude == AltosLib.MISSING && gps.alt != AltosLib.MISSING)
+			gps_pad_altitude = gps.alt;
 	}
 
 	/*
@@ -216,6 +244,7 @@ public class AltosCalData {
 	 * object and then deliver the result atomically to the listener
 	 */
 	AltosGPS		temp_gps = null;
+	AltosGPS		prev_gps = null;
 	int			temp_gps_sat_tick = AltosLib.MISSING;
 
 	public AltosGPS temp_gps() {
@@ -226,8 +255,9 @@ public class AltosCalData {
 		if (temp_gps != null) {
 			if (temp_gps.locked && temp_gps.nsat >= 4)
 				set_gps(temp_gps);
+			prev_gps = temp_gps;
+			temp_gps = null;
 		}
-		temp_gps = null;
 	}
 
 	public boolean gps_pending() {
@@ -236,7 +266,10 @@ public class AltosCalData {
 
 	public AltosGPS make_temp_gps(int tick, boolean sats) {
 		if (temp_gps == null) {
-			temp_gps = new AltosGPS();
+			if (prev_gps != null)
+				temp_gps = prev_gps.clone();
+			else
+				temp_gps = new AltosGPS();
 		}
 		if (sats) {
 			if (tick != temp_gps_sat_tick)
@@ -334,9 +367,16 @@ public class AltosCalData {
 
 	public AltosCalData(AltosConfigData config_data) {
 		set_serial(config_data.serial);
+		set_ticks_per_sec(100.0);
 		set_flight(config_data.flight);
 		set_callsign(config_data.callsign);
+		set_config(config_data.config_major, config_data.config_minor, config_data.flight_log_max);
+		set_firmware_version(config_data.version);
+		set_flight_params(config_data.apogee_delay / ticks_per_sec, config_data.apogee_lockout / ticks_per_sec);
+		set_pad_orientation(config_data.pad_orientation);
+		set_product(config_data.product);
 		set_accel_plus_minus(config_data.accel_cal_plus, config_data.accel_cal_minus);
+		set_accel_zero(config_data.accel_zero_along, config_data.accel_zero_across, config_data.accel_zero_through);
 		set_ms5607(config_data.ms5607);
 		try {
 			set_mma655x_inverted(config_data.mma655x_inverted());