X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetry.java;h=f17e11717c391410fd222148b4e6733165c45ed0;hb=4151c30e1294c0dda3aa02e7ac23b9616f25a4d0;hp=b810ac83842715b0771337f7be625b7e62e37816;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java
index b810ac83..f17e1171 100644
--- a/altoslib/AltosTelemetry.java
+++ b/altoslib/AltosTelemetry.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.text.*;
 
@@ -38,6 +38,9 @@ public abstract class AltosTelemetry implements AltosDataProvider {
 	/* Mark when we received the packet */
 	long		received_time;
 
+	/* Mark frequency packet was received on */
+	public double		frequency = AltosLib.MISSING;
+
 	static boolean cksum(int[] bytes) {
 		int	sum = 0x5a;
 		for (int i = 1; i < bytes.length - 1; i++)
@@ -46,12 +49,13 @@ public abstract class AltosTelemetry implements AltosDataProvider {
 		return sum == bytes[bytes.length - 1];
 	}
 
-	public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
-		cal_data.set_serial(serial());
+	public void provide_data(AltosDataListener listener) {
+		listener.set_serial(serial());
 		if (listener.state == AltosLib.ao_flight_invalid)
 			listener.set_state(AltosLib.ao_flight_startup);
-		cal_data.set_tick(tick());
-		listener.set_time(cal_data.time());
+		if (frequency != AltosLib.MISSING)
+			listener.set_frequency(frequency);
+		listener.set_tick(tick());
 		listener.set_rssi(rssi(), status());
 		listener.set_received_time(received_time);
 	}
@@ -109,6 +113,10 @@ public abstract class AltosTelemetry implements AltosDataProvider {
 		return telem;
 	}
 
+	public void set_frequency(double frequency) {
+		this.frequency = frequency;
+	}
+
 	public AltosTelemetry() {
 		this.received_time = System.currentTimeMillis();
 	}