X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=0ddfdfc3ad50c6ed281cac7a05b5910dd43546a7;hp=e1a5ada8ed2dd02e820f215268bcc4c8480f87b5;hb=9212ce268f3a4a9f3f019f23f6eef8b57207d340;hpb=1f88d345c407e409611448d0e8813ab5a6de0a0b

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index e1a5ada8..0ddfdfc3 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -45,9 +45,10 @@ import android.location.LocationListener;
 import org.altusmetrum.altoslib_1.*;
 
 class AltosLocationListener implements LocationListener {
-	boolean	fine;
+	Handler handler;
 
 	public void onLocationChanged(Location location) {
+		handler.obtainMessage(TelemetryService.MSG_LOCATION, location).sendToTarget();
 	}
 
 	public void onStatusChanged(String provider, int status, Bundle extras) {
@@ -59,8 +60,8 @@ class AltosLocationListener implements LocationListener {
 	public void onProviderDisabled(String provider) {
 	}
 
-	public AltosLocationListener(boolean fine) {
-		this.fine = fine;
+	public AltosLocationListener(Handler handler) {
+		this.handler = handler;
 	}
 }
 
@@ -77,6 +78,8 @@ public class TelemetryService extends Service {
 	static final int MSG_DISCONNECTED      = 6;
 	static final int MSG_TELEMETRY         = 7;
 	static final int MSG_SETFREQUENCY      = 8;
+	static final int MSG_LOCATION	       = 9;
+	static final int MSG_CRC_ERROR	       = 10;
 
 	public static final int STATE_NONE       = 0;
 	public static final int STATE_READY      = 1;
@@ -107,9 +110,14 @@ public class TelemetryService extends Service {
 
 	// location listeners
 
-	private AltosLocationListener gpsListener;
-	private AltosLocationListener netListener;
+	private AltosLocationListener locationListener;
 	
+	// Last data seen; send to UI when it starts
+
+	private AltosState last_state;
+	private Location last_location;
+	private int last_crc_errors;
+
 	// Handler of incoming messages from clients.
 	static class IncomingHandler extends Handler {
 		private final WeakReference<TelemetryService> service;
@@ -129,6 +137,12 @@ public class TelemetryService extends Service {
 					s.mClients.remove(msg.replyTo);
 				}
 				if (D) Log.d(TAG, "Client bound to service");
+				if (s.last_state != null)
+					s.sendTelemetry(s.last_state);
+				if (s.last_location != null)
+					s.sendLocation(s.last_location);
+				if (s.last_crc_errors != 0)
+					s.sendCrcErrors(s.last_crc_errors);
 				break;
 			case MSG_UNREGISTER_CLIENT:
 				s.mClients.remove(msg.replyTo);
@@ -155,8 +169,20 @@ public class TelemetryService extends Service {
 				}
 				break;
 			case MSG_TELEMETRY:
+				// forward telemetry messages
+				s.last_state = (AltosState) msg.obj;
 				s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_TELEMETRY, msg.obj));
 				break;
+			case MSG_LOCATION:
+				// forward location messages
+				s.last_location = (Location) msg.obj;
+				s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_LOCATION, msg.obj));
+				break;
+			case MSG_CRC_ERROR:
+				// forward crc error messages
+				s.last_crc_errors = (Integer) msg.obj;
+				s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_CRC_ERROR, msg.obj));
+				break;
 			case MSG_SETFREQUENCY:
 				if (s.state == STATE_CONNECTED) {
 					try {
@@ -172,6 +198,16 @@ public class TelemetryService extends Service {
 		}
 	}
 
+	public void sendTelemetry(AltosState state) {
+	}
+
+	public void sendLocation(Location location) {
+		mHandler.obtainMessage(MSG_LOCATION, location).sendToTarget();
+	}
+
+	public void sendCrcErrors(int crc_errors) {
+	}
+
 	private void sendMessageToClients(Message m) {
 		for (int i=mClients.size()-1; i>=0; i--) {
 			try {
@@ -279,13 +315,12 @@ public class TelemetryService extends Service {
 		timer.scheduleAtFixedRate(new TimerTask(){ public void run() {onTimerTick();}}, 10000L, 10000L);
 
 		// Listen for GPS and Network position updates
-		gpsListener = new AltosLocationListener(true);
-		netListener = new AltosLocationListener(false);
+		locationListener = new AltosLocationListener(mHandler);
 
 		LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
 		
-		locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, gpsListener);
-		locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, netListener);
+		locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListener);
+		locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, locationListener);
 	}
 
 	@Override
@@ -320,8 +355,7 @@ public class TelemetryService extends Service {
 
 		// Stop listening for location updates
 		LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
-		locationManager.removeUpdates(gpsListener);
-		locationManager.removeUpdates(netListener);
+		locationManager.removeUpdates(locationListener);
 
 		// Stop the bluetooth Comms threads
 		stopAltosBluetooth();