X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosCalData.java;h=2eff6ac1188610753c5b38c212183fbf2f0ac405;hb=4b07adb395f2949dc76275d87b8af10430badb4b;hp=a9955ba8b503e52364cca89538c0641d164d03ff;hpb=3516eeb77048736470de2cc2ca03985efd228d29;p=fw%2Faltos

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index a9955ba8..2eff6ac1 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;
 		}
@@ -163,6 +168,7 @@ public class AltosCalData {
 	}
 
 	public int		tick = AltosLib.MISSING;
+	private int		first_tick = AltosLib.MISSING;
 	private int		prev_tick = AltosLib.MISSING;
 
 	public void set_tick(int tick) {
@@ -172,10 +178,25 @@ public class AltosCalData {
 					tick += 65536;
 				}
 			}
+			if (first_tick == AltosLib.MISSING)
+				first_tick = tick;
+			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() {
@@ -191,9 +212,11 @@ public class AltosCalData {
 	public double time() {
 		if (tick == AltosLib.MISSING)
 			return AltosLib.MISSING;
-		if (boost_tick == AltosLib.MISSING)
-			return AltosLib.MISSING;
-		return (tick - boost_tick) / ticks_per_sec;
+		if (boost_tick != AltosLib.MISSING)
+			return (tick - boost_tick) / ticks_per_sec;
+		if (first_tick != AltosLib.MISSING)
+			return (tick - first_tick) / ticks_per_sec;
+		return tick / ticks_per_sec;
 	}
 
 	public double boost_time() {
@@ -349,9 +372,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());