X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosDataListener.java;h=709b71b63037f3618add139a5032d0e32260fd8c;hp=b644e8170c3ae3b94f5b844fd7ab0082d88b45b7;hb=bed019b64d9e37f276ad5aa2dabb7681aae122ec;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859

diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java
index b644e817..709b71b6 100644
--- a/altoslib/AltosDataListener.java
+++ b/altoslib/AltosDataListener.java
@@ -12,28 +12,88 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 public abstract class AltosDataListener {
 
-	public AltosCalData	cal_data;
+	private AltosCalData	cal_data = null;
 
-	public double	time = AltosLib.MISSING;
+	public double		time = AltosLib.MISSING;
+	public double		frequency = AltosLib.MISSING;
+
+	public int		raw_tick = AltosLib.MISSING;
+
+	public int tick() {
+		return raw_tick;
+	}
+
+	public void set_tick(int tick) {
+		raw_tick = tick;
+		cal_data.set_tick(tick);
+		set_time(cal_data.time());
+	}
+
+	public AltosCalData cal_data() {
+		if (cal_data == null)
+			cal_data = new AltosCalData();
+		return cal_data;
+	}
 
 	public void set_time(double time) {
 		if (time != AltosLib.MISSING)
 			this.time = time;
 	}
 
+	public void set_serial(int serial) {
+		cal_data().set_serial(serial);
+	}
+
+	public void set_device_type(int device_type) {
+		cal_data().set_device_type(device_type);
+		switch (device_type) {
+		case AltosLib.product_telegps:
+			set_state(AltosLib.ao_flight_stateless);
+			break;
+		}
+	}
+
+	public void set_log_format(int log_format) {
+		cal_data().set_log_format(log_format);
+		switch (log_format) {
+		case AltosLib.AO_LOG_FORMAT_TELEGPS:
+			set_state(AltosLib.ao_flight_stateless);
+			break;
+		}
+	}
+
 	public double time() {
 		return time;
 	}
 
-	public int	state = AltosLib.MISSING;
-
 	public void set_state(int state) {
-		if (state != AltosLib.MISSING)
-			this.state = state;
+		cal_data().set_state(state);
+	}
+
+	public int state() {
+		return cal_data().state;
+	}
+
+	public void set_flight(int flight) {
+		cal_data().set_flight(flight);
+	}
+
+	public void set_frequency(double frequency) {
+		this.frequency = frequency;
+	}
+
+	/* Called after all records are captured */
+	public void finish() {
+	}
+
+	public void init() {
+		set_state(AltosLib.ao_flight_invalid);
+		time = AltosLib.MISSING;
+		frequency = AltosLib.MISSING;
 	}
 
 	public abstract void set_rssi(int rssi, int status);
@@ -51,7 +111,18 @@ public abstract class AltosDataListener {
 	public abstract void set_apogee_voltage(double volts);
 	public abstract void set_main_voltage(double volts);
 
-	public abstract void set_gps(AltosGPS gps);
+	public void set_gps(AltosGPS gps) {
+		AltosCalData cal_data = cal_data();
+		cal_data.set_cal_gps(gps);
+	}
+
+	public AltosGPS make_temp_gps(boolean sats) {
+		return cal_data().make_temp_cal_gps(tick(), sats);
+	}
+
+	public AltosGPS temp_gps() {
+		return cal_data().temp_cal_gps();
+	}
 
 	public abstract void set_orient(double orient);
 	public abstract void set_gyro(double roll, double pitch, double yaw);
@@ -59,10 +130,13 @@ public abstract class AltosDataListener {
 	public abstract void set_accel(double along, double across, double through);
 	public abstract void set_mag(double along, double across, double through);
 	public abstract void set_pyro_voltage(double volts);
-	public abstract void set_ignitor_voltage(double[] voltage);
+	public abstract void set_igniter_voltage(double[] voltage);
 	public abstract void set_pyro_fired(int pyro_mask);
 	public abstract void set_companion(AltosCompanion companion);
 
+	public AltosDataListener() {
+	}
+
 	public AltosDataListener(AltosCalData cal_data) {
 		this.cal_data = cal_data;
 	}