altosdroid: Add new "TelemetryReader" class to handle Telemetry

* Add MSG_TELEMETRY messages to both AltosDroid and TelemetryService
  to handle passing of AltosState object all the way back to the UI.
* Remove linkedblockinglist from TelemetryService
* (MSG_TELEMETRY is a rename of MSG_INCOMING_TELEM in AltosDroid)
* commented code in case statement inside AltosDroind - won't work with
  the objects it is currently passed.
* Add new "MSG_DEVCONFIG" message to AltosDroid - allows TelemetryService
  to pass information about the connected device back to the UI.

Signed-off-by: Mike Beattie <mike@ethernal.org>

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 33da93466ac14406fca341673bdad98ca33d8418..cf982eac964b13fcc4bc0049b7db97a0a34c0d10 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -60,8 +60,9 @@ public class AltosDroid extends Activity {
        // 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;
@@ -111,11 +112,12 @@ public class AltosDroid extends Activity {
                                        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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
new file mode 100644 (file)
index 0000000..bfa5db5
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@ -0,0 +1,75 @@
+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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index a1b1915a9fefd4b08d9cf248238ecc7e166fd28c..42198b6ba7c4d759df8fda1f52f86ccee1df7ac9 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -19,7 +19,6 @@ package org.altusmetrum.AltosDroid;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.concurrent.LinkedBlockingQueue;
 
 import android.app.Notification;
 //import android.app.NotificationManager;
@@ -36,7 +35,7 @@ import android.os.RemoteException;
 import android.util.Log;
 import android.widget.Toast;
 
-import org.altusmetrum.AltosLib.*;
+//import org.altusmetrum.AltosLib.*;
 
 public class TelemetryService extends Service {
 
@@ -49,6 +48,7 @@ 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;
@@ -67,8 +67,9 @@ public class TelemetryService extends Service {
        // 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 {
@@ -101,7 +102,6 @@ public class TelemetryService extends Service {
                        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");
@@ -111,6 +111,9 @@ public class TelemetryService extends Service {
                                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);
                        }
@@ -130,13 +133,20 @@ public class TelemetryService extends Service {
        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() {
@@ -160,6 +170,8 @@ public class TelemetryService extends Service {
        private void connected() {
                sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, device.getName()));
                setState(STATE_CONNECTED);
+               mTelemetryReader = new TelemetryReader(mAltosBluetooth, mHandler);
+               mTelemetryReader.start();
        }
 
 
@@ -168,7 +180,6 @@ public class TelemetryService extends Service {
                // 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);
        }