X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=f976e05cdba5ba871eb5b6183b81af54c989bc9a;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hp=dc39c899822ef9ad995ae52c2658f2e21b37e29e;hpb=b1a90adac9f6e2a609ce1ccd6749462bb5c9adbe;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index dc39c899..f976e05c 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -40,7 +41,7 @@ import android.os.Looper;
 import android.widget.Toast;
 import android.location.Criteria;
 
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_12.*;
 
 public class TelemetryService extends Service implements AltosIdleMonitorListener {
 
@@ -258,14 +259,15 @@ public class TelemetryService extends Service implements AltosIdleMonitorListene
 	private void telemetry(AltosTelemetry telem) {
 		AltosState	state;
 
-		if (telemetry_state.states.containsKey(telem.serial))
-			state = telemetry_state.states.get(telem.serial).clone();
+		if (telemetry_state.states.containsKey(telem.serial()))
+			state = telemetry_state.states.get(telem.serial());
 		else
-			state = new AltosState();
-		telem.update_state(state);
-		telemetry_state.states.put(telem.serial, state);
+			state = new AltosState(new AltosCalData());
+		telem.provide_data(state, state.cal_data);
+		telemetry_state.states.put(telem.serial(), state);
+		telemetry_state.quiet = false;
 		if (state != null) {
-			AltosPreferences.set_state(state);
+			AltosPreferences.set_state(state,telem.serial());
 		}
 		send_to_clients();
 	}
@@ -614,6 +616,8 @@ public class TelemetryService extends Service implements AltosIdleMonitorListene
 
 		telemetry_state.latest_serial = AltosPreferences.latest_state();
 
+		telemetry_state.quiet = true;
+
 		AltosDebug.debug("latest serial %d\n", telemetry_state.latest_serial);
 
 		for (int serial : serials) {
@@ -624,7 +628,7 @@ public class TelemetryService extends Service implements AltosIdleMonitorListene
 
 				AltosDebug.debug("recovered old state serial %d flight %d",
 						 serial,
-						 saved_state.flight);
+						 saved_state.cal_data.flight);
 				if (saved_state.gps != null)
 					AltosDebug.debug("\tposition %f,%f",
 							 saved_state.gps.lat,
@@ -698,7 +702,7 @@ public class TelemetryService extends Service implements AltosIdleMonitorListene
 
 	/* AltosIdleMonitorListener */
 	public void update(AltosState state, AltosListenerState listener_state)	{
-		telemetry_state.states.put(state.serial, state);
+		telemetry_state.states.put(state.cal_data.serial, state);
 		telemetry_state.receiver_battery = listener_state.battery;
 		send_to_clients();
 	}