X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosDataListener.java;h=be6d840f0091e9b20d21589634ff63099272f5eb;hb=4151c30e1294c0dda3aa02e7ac23b9616f25a4d0;hp=14c29d85263fc332e2ebe29f8be7bf6a22f121ec;hpb=fd738d47bbc46d36698350d5450abe1125d990a3;p=fw%2Faltos

diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java
index 14c29d85..be6d840f 100644
--- a/altoslib/AltosDataListener.java
+++ b/altoslib/AltosDataListener.java
@@ -12,30 +12,54 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 public abstract class AltosDataListener {
 
-	public AltosCalData	cal_data;
+	private AltosCalData	cal_data = null;
 
-	public double	time = AltosLib.MISSING;
+	public double		time = AltosLib.MISSING;
+	public int		state = AltosLib.MISSING;
+	public double		frequency = AltosLib.MISSING;
+
+	public void set_tick(int 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 double time() {
 		return time;
 	}
 
-	public int	state = AltosLib.MISSING;
-
 	public void set_state(int state) {
+		cal_data().set_state(state);
 		if (state != AltosLib.MISSING)
 			this.state = 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() {
 	}
@@ -67,6 +91,9 @@ public abstract class AltosDataListener {
 	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;
 	}