X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryLocation.java;h=6819fec8c5b9898c133032449db3197bf4795ff8;hp=8ad23ab6396fe69ebdd5ed078ee279f30f8fdd38;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hpb=7600116a191b3ac252a0f716d200d0e0b3500987

diff --git a/altoslib/AltosTelemetryLocation.java b/altoslib/AltosTelemetryLocation.java
index 8ad23ab6..6819fec8 100644
--- a/altoslib/AltosTelemetryLocation.java
+++ b/altoslib/AltosTelemetryLocation.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;
 
 
 public class AltosTelemetryLocation extends AltosTelemetryStandard {
@@ -49,14 +49,18 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard {
 		super(bytes);
 	}
 
-	public void update_state(AltosState state) {
-		super.update_state(state);
-		AltosGPS	gps = state.make_temp_gps(false);
+	public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
+		super.provide_data(listener, cal_data);
+
+		AltosGPS	gps = cal_data.make_temp_gps(tick(), false);
 
 		int flags = flags();
 		gps.nsat = flags & 0xf;
 		gps.locked = (flags & (1 << 4)) != 0;
 		gps.connected = (flags & (1 << 5)) != 0;
+		gps.pdop = pdop() / 10.0;
+		gps.hdop = hdop() / 10.0;
+		gps.vdop = vdop() / 10.0;
 
 		if (gps.locked) {
 			gps.lat = latitude() * 1.0e-7;
@@ -71,10 +75,12 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard {
 			gps.ground_speed = ground_speed() * 1.0e-2;
 			gps.course = course() * 2;
 			gps.climb_rate = climb_rate() * 1.0e-2;
-			gps.pdop = pdop() / 10.0;
-			gps.hdop = hdop() / 10.0;
-			gps.vdop = vdop() / 10.0;
+
+			if (gps.nsat >= 4)
+				cal_data.set_gps(gps);
 		}
-		state.set_temp_gps();
+		listener.set_gps(gps);
+		cal_data.set_gps(gps);
+		cal_data.reset_temp_gps();
 	}
 }