From 5a174f4a2caae97b5038eb92ab85303e736b7c2e Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 27 Jun 2017 21:33:36 -0700 Subject: altosdroid: cal_data is no longer public from AltosState Use cal_data() method instead. Signed-off-by: Keith Packard --- altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java') 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(); } -- cgit v1.2.3