altoslib: Support binary reading/writing in AltosLink

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosBluetooth.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index 18581142efc13679a24d1768af563e538a3e4ff2..643e94f5fa3f8802fef2b7985c058d4dd2deec0c 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@ -1,6 +1,6 @@
 /*
- * Copyright © 2011 Keith Packard <keithp@keithp.com>
- * Copyright © 2012 Mike Beattie <mike@ethernal.org>
+ * Copyright © 2011 Keith Packard <keithp@keithp.com>
+ * Copyright © 2012 Mike Beattie <mike@ethernal.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ import android.os.Handler;
 //import android.os.Message;
 import android.util.Log;
 
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_2.*;
 
 public class AltosBluetooth extends AltosLink {
 
@@ -59,8 +59,6 @@ public class AltosBluetooth extends AltosLink {
                connect_thread = new ConnectThread(device);
                connect_thread.start();
 
-               input_thread = new Thread(this);
-               input_thread.start();
        }
 
        private class ConnectThread extends Thread {
@@ -78,7 +76,7 @@ public class AltosBluetooth extends AltosLink {
                }
 
                public void run() {
-                       if (D) Log.i(TAG, "ConnectThread: BEGIN");
+                       if (D) Log.d(TAG, "ConnectThread: BEGIN");
                        setName("ConnectThread");
 
                        // Always cancel discovery because it will slow down a connection
@@ -108,21 +106,23 @@ public class AltosBluetooth extends AltosLink {
                                        return;
                                }
 
+                               input_thread = new Thread(AltosBluetooth.this);
+                               input_thread.start();
+
                                // Configure the newly connected device for telemetry
                                print("~\nE 0\n");
                                set_monitor(false);
 
-                               // Reset the ConnectThread because we're done
-                               connect_thread = null;
-
-                               // Send the device name back to the Telemetry Service
-                               name = device.getName();
+                               // Let TelemetryService know we're connected
                                handler.obtainMessage(TelemetryService.MSG_CONNECTED).sendToTarget();
 
                                // Notify other waiting threads, now that we're connected
                                AltosBluetooth.this.notifyAll();
 
-                               if (D) Log.i(TAG, "ConnectThread: Connect completed");
+                               // Reset the ConnectThread because we're done
+                               connect_thread = null;
+
+                               if (D) Log.d(TAG, "ConnectThread: Connect completed");
                        }
                }
 
@@ -137,70 +137,79 @@ public class AltosBluetooth extends AltosLink {
        }
 
        private synchronized void wait_connected() throws InterruptedException, IOException {
-               if (D) Log.i(TAG, "wait_connected(): begin");
                if (input == null) {
-                       if (D) Log.i(TAG, "wait_connected(): waiting");
                        wait();
-                       if (D) Log.i(TAG, "wait_connected(): wait ended..");
                        if (input == null) throw new IOException();
                }
        }
 
-       private void connection_failed() {
-               if (D) Log.e(TAG, "Bluetooth Socket IO failed!");
+       private void connection_lost() {
+               if (D) Log.e(TAG, "Connection lost during I/O");
                handler.obtainMessage(TelemetryService.MSG_DISCONNECTED).sendToTarget();
        }
 
        public void print(String data) {
                byte[] bytes = data.getBytes();
-               if (D) Log.i(TAG, "print(): begin");
+               if (D) Log.d(TAG, "print(): begin");
                try {
                        wait_connected();
                        output.write(bytes);
-                       if (D) Log.i(TAG, "print(): Wrote bytes: '" + data.replace('\n', '\\') + "'");
+                       if (D) Log.d(TAG, "print(): Wrote bytes: '" + data.replace('\n', '\\') + "'");
                } catch (IOException e) {
-                       connection_failed();
+                       connection_lost();
                } catch (InterruptedException e) {
-                       connection_failed();
+                       connection_lost();
                }
        }
 
+       public void putchar(byte c) {
+               byte[] bytes = { c };
+               if (D) Log.d(TAG, "print(): begin");
+               try {
+                       wait_connected();
+                       output.write(bytes);
+                       if (D) Log.d(TAG, "print(): Wrote byte: '" + c + "'");
+               } catch (IOException e) {
+                       connection_lost();
+               } catch (InterruptedException e) {
+                       connection_lost();
+               }
+       }               
+
        public int getchar() {
-               if (D) Log.i(TAG, "getchar(): begin");
                try {
                        wait_connected();
-                       if (D) Log.i(TAG, "getchar(): proceeding");
                        return input.read();
                } catch (IOException e) {
-                       connection_failed();
+                       connection_lost();
                } catch (java.lang.InterruptedException e) {
-                       connection_failed();
+                       connection_lost();
                }
                return AltosLink.ERROR;
        }
 
        public void close() {
-               if (D) Log.i(TAG, "close(): begin");
+               if (D) Log.d(TAG, "close(): begin");
                synchronized(this) {
-                       if (D) Log.i(TAG, "close(): synched");
+                       if (D) Log.d(TAG, "close(): synched");
 
                        if (connect_thread != null) {
-                               if (D) Log.i(TAG, "close(): stopping connect_thread");
+                               if (D) Log.d(TAG, "close(): stopping connect_thread");
                                connect_thread.cancel();
                                connect_thread = null;
                        }
-                       if (D) Log.i(TAG, "close(): Closing socket");
+                       if (D) Log.d(TAG, "close(): Closing socket");
                        try {
                                socket.close();
                        } catch (IOException e) {
                                if (D) Log.e(TAG, "close(): unable to close() socket");
                        }
                        if (input_thread != null) {
-                               if (D) Log.i(TAG, "close(): stopping input_thread");
+                               if (D) Log.d(TAG, "close(): stopping input_thread");
                                try {
-                                       if (D) Log.i(TAG, "close(): input_thread.interrupt().....");
+                                       if (D) Log.d(TAG, "close(): input_thread.interrupt().....");
                                        input_thread.interrupt();
-                                       if (D) Log.i(TAG, "close(): input_thread.join().....");
+                                       if (D) Log.d(TAG, "close(): input_thread.join().....");
                                        input_thread.join();
                                } catch (Exception e) {}
                                input_thread = null;
@@ -212,8 +221,16 @@ public class AltosBluetooth extends AltosLink {
        }
 
 
+       // We override this method so that we can add some debugging. Not 100% elegant, but more useful
+       // than debugging one char at a time above in getchar()!
+       public void add_reply(AltosLine line) throws InterruptedException {
+               if (D) Log.d(TAG, String.format("Got REPLY: %s", line.line));
+               super.add_reply(line);
+       }
+
        //public void flush_output() { super.flush_output(); }
 
+       // Stubs of required methods when extending AltosLink
        public boolean can_cancel_reply()   { return false; }
        public boolean show_reply_timeout() { return true; }
        public void hide_reply_timeout()    { }