X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=22a2bbd75bd4724a781df8fa6dd1e54fb25410f5;hb=297eb795b24ec31f6599f48bc8c3769557a7ec6f;hp=45bb47328a2c9abb1cc3c41a454b28673487503b;hpb=b6b5c64f93fa56bcb22ea1c4279e4f754e6e6f1c;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 45bb4732..22a2bbd7 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -41,7 +41,7 @@ import android.os.Looper;
 import android.widget.Toast;
 import android.location.Criteria;
 
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_13.*;
 
 public class TelemetryService extends Service implements AltosIdleMonitorListener {
 
@@ -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();
 	}