X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosCalData.java;h=960de30a45f5aeb1f3f89462c3697616559c43bc;hp=ae0a9294800348cc396445cf7ffc1a1e749820f6;hb=da914cd72411af8c36af05b13c11b9093c8a378c;hpb=21d864206043d2a6048cd859295623bad4d99365

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index ae0a9294..960de30a 100644
--- a/altoslib/AltosCalData.java
+++ b/altoslib/AltosCalData.java
@@ -182,18 +182,24 @@ public class AltosCalData {
 		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;
@@ -343,9 +349,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());