altosdroid: cal_data is no longer public from AltosState

[fw/altos] / 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 f976e05cdba5ba871eb5b6183b81af54c989bc9a..caf288a04b62864270650d3a6330270d78fae39a 100644 (file)
--- 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();
        }