From: Keith Packard Date: Sat, 27 May 2017 02:05:51 +0000 (-0700) Subject: altoslib: Use cal data temp gps for telemetry data too X-Git-Tag: 1.8~84 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=8b4dcca73c65e87462d5f8d08dbc025aa8cf08a6 altoslib: Use cal data temp gps for telemetry data too This avoids bouncing the location data during flight Signed-off-by: Keith Packard --- diff --git a/altoslib/AltosTelemetryLocation.java b/altoslib/AltosTelemetryLocation.java index c7b7fa22..cf849f33 100644 --- a/altoslib/AltosTelemetryLocation.java +++ b/altoslib/AltosTelemetryLocation.java @@ -52,7 +52,7 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard { public void provide_data(AltosDataListener listener, AltosCalData cal_data) { super.provide_data(listener, cal_data); - AltosGPS gps = new AltosGPS(); + AltosGPS gps = cal_data.make_temp_gps(tick(), false); int flags = flags(); gps.nsat = flags & 0xf; @@ -80,5 +80,7 @@ public class AltosTelemetryLocation extends AltosTelemetryStandard { cal_data.set_gps(gps); } listener.set_gps(gps); + cal_data.set_gps(gps); + cal_data.reset_temp_gps(); } } diff --git a/altoslib/AltosTelemetrySatellite.java b/altoslib/AltosTelemetrySatellite.java index 72ddd964..b3afda00 100644 --- a/altoslib/AltosTelemetrySatellite.java +++ b/altoslib/AltosTelemetrySatellite.java @@ -47,9 +47,10 @@ public class AltosTelemetrySatellite extends AltosTelemetryStandard { public void provide_data(AltosDataListener listener, AltosCalData cal_data) { super.provide_data(listener, cal_data); - AltosGPS gps = new AltosGPS(); + AltosGPS gps = cal_data.make_temp_gps(tick(), true); gps.cc_gps_sat = sats(); listener.set_gps(gps); + cal_data.reset_temp_gps(); } }