summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-05-26 19:05:51 -0700
committerKeith Packard <keithp@keithp.com>2017-05-26 19:05:51 -0700
commit8b4dcca73c65e87462d5f8d08dbc025aa8cf08a6 (patch)
treea644d40ba1f60215ae826c1c2ebff971910e9050
parent612756291c7fb68d337c3be2e8197d39e31f3b5c (diff)
altoslib: Use cal data temp gps for telemetry data too
This avoids bouncing the location data during flight Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--altoslib/AltosTelemetryLocation.java4
-rw-r--r--altoslib/AltosTelemetrySatellite.java3
2 files changed, 5 insertions, 2 deletions
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();
}
}