X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=bc3371f3cfee607dc16f495cc2565976bee0d93b;hb=c5b31a14e1ceeb9a33e0016f345832344d24ced7;hp=e68545856862bd361bec34172b037559f6e7f04a;hpb=9a8cc23de5776ea3fa2bdc96cbe63422eb555d63;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index e6854585..bc3371f3 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -45,10 +45,10 @@ import android.location.LocationListener;
 import org.altusmetrum.altoslib_1.*;
 
 class AltosLocationListener implements LocationListener {
-	TelemetryService service;
+	Handler handler;
 
 	public void onLocationChanged(Location location) {
-		service.sendLocation(location);
+		handler.obtainMessage(TelemetryService.MSG_LOCATION, location).sendToTarget();
 	}
 
 	public void onStatusChanged(String provider, int status, Bundle extras) {
@@ -60,8 +60,8 @@ class AltosLocationListener implements LocationListener {
 	public void onProviderDisabled(String provider) {
 	}
 
-	public AltosLocationListener(TelemetryService service) {
-		this.service = service;
+	public AltosLocationListener(Handler handler) {
+		this.handler = handler;
 	}
 }
 
@@ -133,16 +133,14 @@ public class TelemetryService extends Service {
 					// Now we try to send the freshly connected UI any relavant information about what
 					// we're talking to - Basically state and Config Data.
 					msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, s.state, -1, s.mConfigData));
+					// We also send any recent telemetry or location data that's cached
+					if (s.last_state      != null) msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_TELEMETRY, s.last_state     ));
+					if (s.last_location   != null) msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_LOCATION , s.last_location  ));
+					if (s.last_crc_errors != 0   ) msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_CRC_ERROR, s.last_crc_errors));
 				} catch (RemoteException e) {
 					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);
@@ -169,8 +167,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 {
@@ -186,21 +196,6 @@ public class TelemetryService extends Service {
 		}
 	}
 
-	public void sendTelemetry(AltosState state) {
-		last_state = state;
-		mHandler.obtainMessage(MSG_TELEMETRY, state).sendToTarget();
-	}
-
-	public void sendLocation(Location location) {
-		last_location = location;
-		mHandler.obtainMessage(MSG_LOCATION, location).sendToTarget();
-	}
-
-	public void sendCrcErrors(int crc_errors) {
-		last_crc_errors = crc_errors;
-		mHandler.obtainMessage(MSG_CRC_ERROR, new Integer(crc_errors)).sendToTarget();
-	}
-
 	private void sendMessageToClients(Message m) {
 		for (int i=mClients.size()-1; i>=0; i--) {
 			try {
@@ -238,6 +233,9 @@ public class TelemetryService extends Service {
 	}
 
 	private void startAltosBluetooth() {
+		if (device == null) {
+			return;
+		}
 		if (mAltosBluetooth == null) {
 			if (D) Log.d(TAG, String.format("startAltosBluetooth(): Connecting to %s (%s)", device.getName(), device.getAddress()));
 			mAltosBluetooth = new AltosBluetooth(device, mHandler);
@@ -267,6 +265,8 @@ public class TelemetryService extends Service {
 
 	private void connected() {
 		try {
+			if (mAltosBluetooth == null)
+				throw new InterruptedException("no bluetooth");
 			mConfigData = mAltosBluetooth.config_data();
 		} catch (InterruptedException e) {
 		} catch (TimeoutException e) {
@@ -278,7 +278,7 @@ public class TelemetryService extends Service {
 
 		setState(STATE_CONNECTED);
 
-		mTelemetryReader = new TelemetryReader(this, mAltosBluetooth, mHandler);
+		mTelemetryReader = new TelemetryReader(mAltosBluetooth, mHandler);
 		mTelemetryReader.start();
 		
 		mTelemetryLogger = new TelemetryLogger(this, mAltosBluetooth);
@@ -308,7 +308,7 @@ public class TelemetryService extends Service {
 		timer.scheduleAtFixedRate(new TimerTask(){ public void run() {onTimerTick();}}, 10000L, 10000L);
 
 		// Listen for GPS and Network position updates
-		locationListener = new AltosLocationListener(this);
+		locationListener = new AltosLocationListener(mHandler);
 
 		LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);