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

diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java
index 5600e7be..b810ac83 100644
--- a/altoslib/AltosTelemetry.java
+++ b/altoslib/AltosTelemetry.java
@@ -24,7 +24,7 @@ import java.text.*;
  * Telemetry data contents
  */
 
-public abstract class AltosTelemetry implements AltosStateUpdate {
+public abstract class AltosTelemetry implements AltosDataProvider {
 	int[]	bytes;
 
 	/* All telemetry packets have these fields */
@@ -46,13 +46,14 @@ public abstract class AltosTelemetry implements AltosStateUpdate {
 		return sum == bytes[bytes.length - 1];
 	}
 
-	public void update_state(AltosState state) {
-		state.set_serial(serial());
-		if (state.state() == AltosLib.ao_flight_invalid)
-			state.set_state(AltosLib.ao_flight_startup);
-		state.set_tick(tick());
-		state.set_rssi(rssi(), status());
-		state.set_received_time(received_time);
+	public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
+		cal_data.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());
+		listener.set_rssi(rssi(), status());
+		listener.set_received_time(received_time);
 	}
 
 	final static int PKT_APPEND_STATUS_1_CRC_OK		= (1 << 7);
@@ -108,29 +109,6 @@ public abstract class AltosTelemetry implements AltosStateUpdate {
 		return telem;
 	}
 
-	public static int extend_height(AltosState state, int height_16) {
-		double	compare_height;
-		int	height = height_16;
-
-		if (state.gps != null && state.gps.alt != AltosLib.MISSING) {
-			compare_height = state.gps_height();
-		} else {
-			compare_height = state.height();
-		}
-
-		if (compare_height != AltosLib.MISSING) {
-			int	high_bits = (int) Math.floor (compare_height / 65536.0);
-
-			height = (high_bits << 16) | (height_16 & 0xffff);
-
-			if (Math.abs(height + 65536 - compare_height) < Math.abs(height - compare_height))
-				height += 65536;
-			else if (Math.abs(height - 65536 - compare_height) < Math.abs(height - compare_height))
-				height -= 65536;
-		}
-		return height;
-	}
-
 	public AltosTelemetry() {
 		this.received_time = System.currentTimeMillis();
 	}