altosdroid: lots of debugging statements

[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 1f0946799d71549c35e19ffb2a78b24752d385a6..3071c8f19ac5ef8b3c7cafc7871366637ec3cc4a 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@ -26,6 +26,7 @@ import java.util.UUID;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
+import android.os.Handler;
 import android.util.Log;
 
 import org.altusmetrum.AltosLib.*;
@@ -36,17 +37,29 @@ public class AltosBluetooth extends AltosLink {
        private static final String TAG = "AltosBluetooth";
        private static final boolean D = true;
 
-       /**
-        * This thread runs while attempting to make an outgoing connection
-        * with a device. It runs straight through; the connection either
-        * succeeds or fails.
-        */
+       private ConnectThread    connect_thread = null;
+       private Thread           input_thread   = null;
 
-       private BluetoothAdapter        adapter;
-       private ConnectThread           connect_thread;
-       private BluetoothSocket         socket;
-       private InputStream             input;
-       private OutputStream            output;
+       private Handler          handler;
+
+       private BluetoothAdapter adapter;
+       private BluetoothDevice  device;
+       private BluetoothSocket  socket;
+       private InputStream      input;
+       private OutputStream     output;
+
+       // Constructor
+       public AltosBluetooth(BluetoothDevice in_device, Handler in_handler) {
+               adapter = BluetoothAdapter.getDefaultAdapter();
+               device = in_device;
+               handler = in_handler;
+
+               connect_thread = new ConnectThread(device);
+               connect_thread.start();
+
+               input_thread = new Thread(this);
+               input_thread.start();
+       }
 
        private class ConnectThread extends Thread {
                private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
@@ -63,7 +76,7 @@ public class AltosBluetooth extends AltosLink {
                }
 
                public void run() {
-                       if (D) Log.i(TAG, "BEGIN ConnectThread");
+                       if (D) Log.i(TAG, "ConnectThread: BEGIN");
                        setName("ConnectThread");
 
                        // Always cancel discovery because it will slow down a connection
@@ -90,6 +103,10 @@ public class AltosBluetooth extends AltosLink {
                                        input = socket.getInputStream();
                                        output = socket.getOutputStream();
 
+                                       // Configure the newly connected device for telemetry
+                                       print("~\nE 0\n");
+                                       set_monitor(false);
+
                                        // Reset the ConnectThread because we're done
                                        AltosBluetooth.this.notify();
                                        connect_thread = null;
@@ -106,25 +123,31 @@ public class AltosBluetooth extends AltosLink {
                                if (socket != null)
                                        socket.close();
                        } catch (IOException e) {
-                               if (D) Log.e(TAG, "close() of connect socket failed", e);
+                               if (D) Log.e(TAG, "ConnectThread: close() of connect socket failed", e);
                        }
                }
        }
 
        private synchronized void wait_connected() throws InterruptedException {
+               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..");
                }
        }
 
        private void connection_failed() {
+               if (D) Log.e(TAG, "Bluetooth Socket IO failed!");
        }
        
        public void print(String data) {
                byte[] bytes = data.getBytes();
+               if (D) Log.i(TAG, "print(): begin");
                try {
                        wait_connected();
                        output.write(bytes);
+                       if (D) Log.i(TAG, "print(): Wrote bytes: '" + data.replace('\n', '\\') + "'");
                } catch (IOException e) {
                        connection_failed();
                } catch (InterruptedException e) {
@@ -133,8 +156,10 @@ public class AltosBluetooth extends AltosLink {
        }
 
        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();
@@ -145,32 +170,33 @@ public class AltosBluetooth extends AltosLink {
        }
                        
        public void close() {
+               if (D) Log.i(TAG, "close(): begin");
                synchronized(this) {
+                       if (D) Log.i(TAG, "close(): synched");
+
                        if (connect_thread != null) {
+                               if (D) Log.i(TAG, "close(): stopping connect_thread");
                                connect_thread.cancel();
                                connect_thread = null;
                        }
+                       if (input_thread != null) {
+                               if (D) Log.i(TAG, "close(): stopping input_thread");
+                               try {
+                                       if (D) Log.i(TAG, "close(): input_thread.interrupt().....");
+                                       input_thread.interrupt();
+                                       if (D) Log.i(TAG, "close(): input_thread.join().....");
+                                       input_thread.join();
+                               } catch (Exception e) {}
+                               input_thread = null;
+                       }
                }
        }
 
-       public void flush_output() {
-               super.flush_output();
-               /* any local work needed to flush bluetooth? */
-       }
 
-       public boolean can_cancel_reply() {
-               return false;
-       }
-       public boolean show_reply_timeout() {
-               return true;
-       }
-               
-       public void hide_reply_timeout() {
-       }
+       //public void flush_output() { super.flush_output(); }
 
-       public AltosBluetooth(BluetoothDevice device) {
-               adapter = BluetoothAdapter.getDefaultAdapter();
-               connect_thread = new ConnectThread(device, true);
-               connect_thread.start();
-       }
-}
\ No newline at end of file
+       public boolean can_cancel_reply()   { return false; }
+       public boolean show_reply_timeout() { return true; }
+       public void hide_reply_timeout()    { }
+
+}