X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosDataListener.java;h=b19cbedbbdb513b914a6edf1bbe55cf58af2608f;hb=4af1fba120644f38e91bae283c9ff2ef32c2e49c;hp=fb37fe3d6453229fa1d107fae80c616272ef2871;hpb=de2b6ec1cdfd48c948bff7edbfe2540440429b1b;p=fw%2Faltos

diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java
index fb37fe3d..b19cbedb 100644
--- a/altoslib/AltosDataListener.java
+++ b/altoslib/AltosDataListener.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_14;
 
 public abstract class AltosDataListener {
 
@@ -21,7 +21,14 @@ public abstract class AltosDataListener {
 	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());
 	}
@@ -52,6 +59,8 @@ public abstract class AltosDataListener {
 
 	public void set_log_format(int log_format) {
 		cal_data().set_log_format(log_format);
+		if (cal_data().device_type == AltosLib.MISSING)
+			cal_data().set_device_type(AltosLib.product_id_from_log_format(log_format));
 		switch (log_format) {
 		case AltosLib.AO_LOG_FORMAT_TELEGPS:
 			set_state(AltosLib.ao_flight_stateless);
@@ -63,6 +72,10 @@ public abstract class AltosDataListener {
 		return time;
 	}
 
+	public String state_name() {
+		return cal_data().state_name();
+	}
+
 	public void set_state(int state) {
 		cal_data().set_state(state);
 	}
@@ -79,6 +92,9 @@ public abstract class AltosDataListener {
 		this.frequency = frequency;
 	}
 
+	public void set_avoid_duplicate_files() {
+	}
+
 	/* Called after all records are captured */
 	public void finish() {
 	}
@@ -104,7 +120,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, boolean set_location, boolean set_sats) {
+		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);
@@ -115,6 +142,7 @@ public abstract class AltosDataListener {
 	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 abstract void set_motor_pressure(double motor_pressure);
 
 	public AltosDataListener() {
 	}