X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=8e5c7903149c6648ef016ad953d4f878c3ab378b;hb=bc3fbcb35090be3856284ccf4d908ebf39d02bec;hp=98b7d32ff68eff665732cf6685dac49f3244c129;hpb=83ce46c73b0e876f9f630943af19ea97b3a21d3c;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java index 98b7d32f..8e5c7903 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java @@ -36,38 +36,18 @@ import android.os.Handler; import android.os.Message; import android.os.Messenger; import android.os.RemoteException; +import android.os.Looper; import android.util.Log; import android.widget.Toast; import android.location.Location; import android.location.LocationManager; import android.location.LocationListener; +import android.location.Criteria; -import org.altusmetrum.altoslib_1.*; +import org.altusmetrum.altoslib_5.*; -class AltosLocationListener implements LocationListener { - TelemetryService service; - boolean fine; - public void onLocationChanged(Location location) { - service.sendLocation(location); - } - - public void onStatusChanged(String provider, int status, Bundle extras) { - } - - public void onProviderEnabled(String provider) { - } - - public void onProviderDisabled(String provider) { - } - - public AltosLocationListener(TelemetryService service, boolean fine) { - this.fine = fine; - this.service = service; - } -} - -public class TelemetryService extends Service { +public class TelemetryService extends Service implements LocationListener { private static final String TAG = "TelemetryService"; private static final boolean D = true; @@ -80,8 +60,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; + static final int MSG_CRC_ERROR = 9; + static final int MSG_SETBAUD = 10; public static final int STATE_NONE = 0; public static final int STATE_READY = 1; @@ -110,11 +90,6 @@ public class TelemetryService extends Service { // internally track state of bluetooth connection private int state = STATE_NONE; - // location listeners - - private AltosLocationListener gpsListener; - private AltosLocationListener netListener; - // Last data seen; send to UI when it starts private AltosState last_state; @@ -136,16 +111,18 @@ 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)); + if (s.state == STATE_CONNECTED) { + msg.replyTo.send(s.frequency_message()); + msg.replyTo.send(s.telemetry_rate_message()); + } } 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); @@ -158,13 +135,17 @@ public class TelemetryService extends Service { break; case MSG_CONNECTED: if (D) Log.d(TAG, "Connected to device"); - s.connected(); + try { + s.connected(); + } catch (InterruptedException ie) { + } break; case MSG_CONNECT_FAILED: if (D) Log.d(TAG, "Connection failed... retrying"); s.startAltosBluetooth(); break; case MSG_DISCONNECTED: + Log.d(TAG, "MSG_DISCONNECTED"); // Only do the following if we haven't been shutdown elsewhere.. if (s.device != null) { if (D) Log.d(TAG, "Disconnected from " + s.device.getName()); @@ -172,38 +153,39 @@ 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_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 { s.mAltosBluetooth.set_radio_frequency((Double) msg.obj); + s.mAltosBluetooth.save_frequency(); + s.sendMessageToClients(s.frequency_message()); } catch (InterruptedException e) { } catch (TimeoutException e) { } } break; + case MSG_SETBAUD: + if (s.state == STATE_CONNECTED) { + s.mAltosBluetooth.set_telemetry_rate((Integer) msg.obj); + s.mAltosBluetooth.save_telemetry_rate(); + s.sendMessageToClients(s.telemetry_rate_message()); + } + break; default: super.handleMessage(msg); } } } - 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 { @@ -214,6 +196,16 @@ public class TelemetryService extends Service { } } + private Message frequency_message() { + if (D) Log.d(TAG, String.format("frequency_message %f\n", mAltosBluetooth.frequency())); + return Message.obtain(null, AltosDroid.MSG_FREQUENCY, mAltosBluetooth.frequency()); + } + + private Message telemetry_rate_message() { + if (D) Log.d(TAG, String.format("telemetry_rate_message %d\n", mAltosBluetooth.telemetry_rate())); + return Message.obtain(null, AltosDroid.MSG_TELEMETRY_RATE, mAltosBluetooth.telemetry_rate()); + } + private void stopAltosBluetooth() { if (D) Log.d(TAG, "stopAltosBluetooth(): begin"); setState(STATE_READY); @@ -241,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); @@ -268,10 +263,14 @@ public class TelemetryService extends Service { sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1, acd)); } - private void connected() { + private void connected() throws InterruptedException { try { + if (mAltosBluetooth == null) + throw new InterruptedException("no bluetooth"); mConfigData = mAltosBluetooth.config_data(); - } catch (InterruptedException e) { + if (D) Log.d(TAG, "send frequency/rate messages\n"); + sendMessageToClients(frequency_message()); + sendMessageToClients(telemetry_rate_message()); } catch (TimeoutException e) { // If this timed out, then we really want to retry it, but // probably safer to just retry the connection from scratch. @@ -281,12 +280,14 @@ 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); - } + sendMessageToClients(frequency_message()); + sendMessageToClients(telemetry_rate_message()); + } private void onTimerTick() { if (D) Log.d(TAG, "Timer wakeup"); @@ -311,13 +312,10 @@ 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(this, true); - netListener = new AltosLocationListener(this, false); - 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, 1000, 1, this); +// locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, this); } @Override @@ -351,9 +349,7 @@ public class TelemetryService extends Service { public void onDestroy() { // Stop listening for location updates - LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE); - locationManager.removeUpdates(gpsListener); - locationManager.removeUpdates(netListener); + ((LocationManager) getSystemService(Context.LOCATION_SERVICE)).removeUpdates(this); // Stop the bluetooth Comms threads stopAltosBluetooth(); @@ -374,4 +370,18 @@ public class TelemetryService extends Service { } + public void onLocationChanged(Location location) { + last_location = location; + sendMessageToClients(Message.obtain(null, AltosDroid.MSG_LOCATION, location)); + } + + public void onStatusChanged(String provider, int status, Bundle extras) { + } + + public void onProviderEnabled(String provider) { + } + + public void onProviderDisabled(String provider) { + } + }