summaryrefslogtreecommitdiff
path: root/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-06-27 21:33:36 -0700
committerKeith Packard <keithp@keithp.com>2017-06-27 21:33:36 -0700
commit5a174f4a2caae97b5038eb92ab85303e736b7c2e (patch)
tree72d4f1b3ca77245a1879c5c5dae3b95b70978e6b /altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
parent6dbb362b2d1df4d8c2d301e90624aceef8051ef5 (diff)
altosdroid: cal_data is no longer public from AltosState
Use cal_data() method instead. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java')
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index f976e05c..caf288a0 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -263,7 +263,7 @@ public class TelemetryService extends Service implements AltosIdleMonitorListene
state = telemetry_state.states.get(telem.serial());
else
state = new AltosState(new AltosCalData());
- telem.provide_data(state, state.cal_data);
+ telem.provide_data(state);
telemetry_state.states.put(telem.serial(), state);
telemetry_state.quiet = false;
if (state != null) {
@@ -628,7 +628,7 @@ public class TelemetryService extends Service implements AltosIdleMonitorListene
AltosDebug.debug("recovered old state serial %d flight %d",
serial,
- saved_state.cal_data.flight);
+ saved_state.cal_data().flight);
if (saved_state.gps != null)
AltosDebug.debug("\tposition %f,%f",
saved_state.gps.lat,
@@ -702,7 +702,7 @@ public class TelemetryService extends Service implements AltosIdleMonitorListene
/* AltosIdleMonitorListener */
public void update(AltosState state, AltosListenerState listener_state) {
- telemetry_state.states.put(state.cal_data.serial, state);
+ telemetry_state.states.put(state.cal_data().serial, state);
telemetry_state.receiver_battery = listener_state.battery;
send_to_clients();
}