// Message types sent from the TelemetryService Handler
public static final int MSG_STATE_CHANGE = 1;
public static final int MSG_DEVNAME = 2;
- public static final int MSG_INCOMING_TELEM = 3;
- public static final int MSG_TOAST = 4;
+ public static final int MSG_TOAST = 3;
+ public static final int MSG_DEVCONFIG = 4;
+ public static final int MSG_TELEMETRY = 5;
// Intent request codes
private static final int REQUEST_CONNECT_DEVICE = 1;
break;
}
break;
- case MSG_INCOMING_TELEM:
- byte[] buf = (byte[]) msg.obj;
+ case MSG_DEVCONFIG:
+ case MSG_TELEMETRY:
+ //byte[] buf = (byte[]) msg.obj;
// construct a string from the buffer
- String telem = new String(buf);
- ad.mSerialView.append(telem);
+ //String telem = new String(buf);
+ //ad.mSerialView.append(telem);
break;
case MSG_DEVNAME:
// save the connected device's name
--- /dev/null
+package org.altusmetrum.AltosDroid;\r
+\r
+import java.text.*;\r
+import java.io.*;\r
+import java.util.concurrent.*;\r
+import android.util.Log;\r
+import android.os.Handler;\r
+\r
+import org.altusmetrum.AltosLib.*;\r
+\r
+\r
+public class TelemetryReader extends Thread {\r
+\r
+ private static final String TAG = "TelemetryReader";\r
+\r
+ int crc_errors;\r
+\r
+ Handler handler;\r
+\r
+ AltosLink link;\r
+ AltosRecord previous;\r
+\r
+ LinkedBlockingQueue<AltosLine> telem;\r
+\r
+ public AltosRecord read() throws ParseException, AltosCRCException, InterruptedException, IOException {\r
+ AltosLine l = telem.take();\r
+ if (l.line == null)\r
+ throw new IOException("IO error");\r
+ AltosRecord next = AltosTelemetry.parse(l.line, previous);\r
+ previous = next;\r
+ return next;\r
+ }\r
+\r
+ public void close() {\r
+ previous = null;\r
+ link.remove_monitor(telem);\r
+ link = null;\r
+ telem.clear();\r
+ telem = null;\r
+ }\r
+\r
+ public void run() {\r
+ AltosState state = null;\r
+\r
+ try {\r
+ for (;;) {\r
+ try {\r
+ AltosRecord record = read();\r
+ if (record == null)\r
+ break;\r
+ state = new AltosState(record, state);\r
+\r
+ handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();\r
+ } catch (ParseException pp) {\r
+ Log.e(TAG, String.format("Parse error: %d \"%s\"", pp.getErrorOffset(), pp.getMessage()));\r
+ } catch (AltosCRCException ce) {\r
+ ++crc_errors;\r
+ }\r
+ }\r
+ } catch (InterruptedException ee) {\r
+ } catch (IOException ie) {\r
+ } finally {\r
+ close();\r
+ }\r
+ }\r
+\r
+ public TelemetryReader (AltosLink in_link, Handler in_handler) {\r
+ link = in_link;\r
+ handler = in_handler;\r
+\r
+ previous = null;\r
+ telem = new LinkedBlockingQueue<AltosLine>();\r
+ link.add_monitor(telem);\r
+ }\r
+}\r
import java.lang.ref.WeakReference;
import java.util.ArrayList;
-import java.util.concurrent.LinkedBlockingQueue;
import android.app.Notification;
//import android.app.NotificationManager;
import android.util.Log;
import android.widget.Toast;
-import org.altusmetrum.AltosLib.*;
+//import org.altusmetrum.AltosLib.*;
public class TelemetryService extends Service {
static final int MSG_CONNECTED = 4;
static final int MSG_CONNECT_FAILED = 5;
static final int MSG_DISCONNECTED = 6;
+ static final int MSG_TELEMETRY = 7;
public static final int STATE_NONE = 0;
public static final int STATE_READY = 1;
// Name of the connected device
private BluetoothDevice device = null;
private AltosBluetooth mAltosBluetooth = null;
+ private TelemetryReader mTelemetryReader = null;
+
private int state = STATE_NONE;
- LinkedBlockingQueue<AltosLine> telem;
// Handler of incoming messages from clients.
static class IncomingHandler extends Handler {
case MSG_CONNECTED:
if (D) Log.d(TAG, "Connected to device");
s.connected();
- s.mAltosBluetooth.add_monitor(s.telem);
break;
case MSG_CONNECT_FAILED:
if (D) Log.d(TAG, "Connection failed... retrying");
if (D) Log.d(TAG, "Disconnected from " + s.device.getName());
s.stopAltosBluetooth();
break;
+ case MSG_TELEMETRY:
+ s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_TELEMETRY, msg.obj));
+ break;
default:
super.handleMessage(msg);
}
private void stopAltosBluetooth() {
if (D) Log.i(TAG, "Stopping BT");
setState(STATE_READY);
+ if (mTelemetryReader != null) {
+ mTelemetryReader.interrupt();
+ try {
+ mTelemetryReader.join();
+ } catch (InterruptedException e) {
+ }
+ mTelemetryReader = null;
+ }
if (mAltosBluetooth != null) {
if (D) Log.i(TAG, "Closing AltosBluetooth");
mAltosBluetooth.close();
mAltosBluetooth = null;
}
device = null;
- telem.clear();
}
private void startAltosBluetooth() {
private void connected() {
sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, device.getName()));
setState(STATE_CONNECTED);
+ mTelemetryReader = new TelemetryReader(mAltosBluetooth, mHandler);
+ mTelemetryReader.start();
}
// Create a reference to the NotificationManager so that we can update our notifcation text later
//mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
- telem = new LinkedBlockingQueue<AltosLine>();
setState(STATE_READY);
}