Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosBluetooth.java
index 5a8ed096ff429f6e88b5ddf60006ebbe7fd24390..973250a567c6f754b22dbca84d8d725ec83e4593 100644 (file)
@@ -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_6.*;
 
 public class AltosBluetooth extends AltosLink {
 
@@ -52,6 +52,7 @@ public class AltosBluetooth extends AltosLink {
 
        // Constructor
        public AltosBluetooth(BluetoothDevice in_device, Handler in_handler) {
+//             set_debug(D);
                adapter = BluetoothAdapter.getDefaultAdapter();
                device = in_device;
                handler = in_handler;
@@ -59,8 +60,65 @@ public class AltosBluetooth extends AltosLink {
                connect_thread = new ConnectThread(device);
                connect_thread.start();
 
-               input_thread = new Thread(this);
-               input_thread.start();
+       }
+
+       private void connected() {
+               try {
+                       synchronized(this) {
+                               if (socket != null) {
+                                       input = socket.getInputStream();
+                                       output = socket.getOutputStream();
+
+                                       input_thread = new Thread(this);
+                                       input_thread.start();
+
+                                       // Configure the newly connected device for telemetry
+                                       print("~\nE 0\n");
+                                       set_monitor(false);
+                                       if (D) Log.d(TAG, "ConnectThread: connected");
+
+                                       /* Let TelemetryService know we're connected
+                                        */
+                                       handler.obtainMessage(TelemetryService.MSG_CONNECTED).sendToTarget();
+
+                                       /* Notify other waiting threads that we're connected now
+                                        */
+                                       notifyAll();
+                               }
+                       }
+               } catch (IOException io) {
+                       connect_failed();
+               }
+       }
+
+       private void connect_failed() {
+               synchronized (this) {
+                       if (socket != null) {
+                               try {
+                                       socket.close();
+                               } catch (IOException e2) {
+                                       if (D) Log.e(TAG, "ConnectThread: Failed to close() socket after failed connection");
+                               }
+                               socket = null;
+                       }
+                       input = null;
+                       output = null;
+                       handler.obtainMessage(TelemetryService.MSG_CONNECT_FAILED).sendToTarget();
+                       if (D) Log.e(TAG, "ConnectThread: Failed to establish connection");
+               }
+       }
+
+       private Object closing_lock = new Object();
+       private boolean closing = false;
+
+       private void disconnected() {
+               synchronized(closing_lock) {
+                       if (D) Log.e(TAG, String.format("Connection lost during I/O. Closing  %b", closing));
+                       if (!closing) {
+                               if (D) Log.d(TAG, "Sending disconnected message");
+                               handler.obtainMessage(TelemetryService.MSG_DISCONNECTED).sendToTarget();
+                       }
+               }
        }
 
        private class ConnectThread extends Thread {
@@ -84,68 +142,74 @@ public class AltosBluetooth extends AltosLink {
                        // Always cancel discovery because it will slow down a connection
                        adapter.cancelDiscovery();
 
-                       synchronized (AltosBluetooth.this) {
-                               // Make a connection to the BluetoothSocket
-                               try {
-                                       // This is a blocking call and will only return on a
-                                       // successful connection or an exception
-                                       socket.connect();
+                       BluetoothSocket local_socket;
 
-                                       input = socket.getInputStream();
-                                       output = socket.getOutputStream();
-                               } catch (IOException e) {
-                                       // Close the socket
-                                       try {
-                                               socket.close();
-                                       } catch (IOException e2) {
-                                               if (D) Log.e(TAG, "ConnectThread: Failed to close() socket after failed connection");
-                                       }
-                                       input = null;
-                                       output = null;
-                                       AltosBluetooth.this.notifyAll();
-                                       handler.obtainMessage(TelemetryService.MSG_CONNECT_FAILED).sendToTarget();
-                                       if (D) Log.e(TAG, "ConnectThread: Failed to establish connection");
-                                       return;
+                       try {
+                               synchronized (AltosBluetooth.this) {
+                                       local_socket = socket;
                                }
 
-                               // Configure the newly connected device for telemetry
-                               print("~\nE 0\n");
-                               set_monitor(false);
-
-                               // Reset the ConnectThread because we're done
-                               connect_thread = null;
+                               if (local_socket != null) {
+                                       // Make a connection to the BluetoothSocket
+                                       // This is a blocking call and will only return on a
+                                       // successful connection or an exception
+                                       local_socket.connect();
+                               }
 
-                               // Send the device name back to the Telemetry Service
-                               name = device.getName();
-                               handler.obtainMessage(TelemetryService.MSG_CONNECTED).sendToTarget();
+                               connected();
 
-                               // Notify other waiting threads, now that we're connected
-                               AltosBluetooth.this.notifyAll();
+                       } catch (IOException e) {
+                               connect_failed();
+                       }
 
-                               if (D) Log.d(TAG, "ConnectThread: Connect completed");
+                       synchronized (AltosBluetooth.this) {
+                               /* Reset the ConnectThread because we're done
+                                */
+                               connect_thread = null;
                        }
+                       if (D) Log.d(TAG, "ConnectThread: Connect completed");
                }
 
                public void cancel() {
                        try {
-                               if (socket != null)
-                                       socket.close();
+                               BluetoothSocket local_socket;
+                               synchronized(AltosBluetooth.this) {
+                                       local_socket = socket;
+                                       socket = null;
+                               }
+                               if (local_socket != null)
+                                       local_socket.close();
+
                        } catch (IOException e) {
                                if (D) Log.e(TAG, "ConnectThread: close() of connect socket failed", e);
                        }
                }
        }
 
+       public double frequency() {
+               return frequency;
+       }
+
+       public int telemetry_rate() {
+               return telemetry_rate;
+       }
+
+       public void save_frequency() {
+               AltosPreferences.set_frequency(0, frequency);
+       }
+
+       public void save_telemetry_rate() {
+               AltosPreferences.set_telemetry_rate(0, telemetry_rate);
+       }
+
        private synchronized void wait_connected() throws InterruptedException, IOException {
-               if (input == null) {
+               if (input == null && socket != null) {
+                       if (D) Log.d(TAG, "wait_connected...");
                        wait();
-                       if (input == null) throw new IOException();
+                       if (D) Log.d(TAG, "wait_connected done");
                }
-       }
-
-       private void connection_failed() {
-               if (D) Log.e(TAG, "Connection lost during I/O");
-               handler.obtainMessage(TelemetryService.MSG_DISCONNECTED).sendToTarget();
+               if (socket == null)
+                       throw new IOException();
        }
 
        public void print(String data) {
@@ -156,40 +220,77 @@ public class AltosBluetooth extends AltosLink {
                        output.write(bytes);
                        if (D) Log.d(TAG, "print(): Wrote bytes: '" + data.replace('\n', '\\') + "'");
                } catch (IOException e) {
-                       connection_failed();
+                       disconnected();
                } catch (InterruptedException e) {
-                       connection_failed();
+                       disconnected();
                }
        }
 
-       public int getchar() {
+       public void putchar(byte c) {
+               byte[] bytes = { c };
+               if (D) Log.d(TAG, "print(): begin");
                try {
                        wait_connected();
-                       return input.read();
+                       output.write(bytes);
+                       if (D) Log.d(TAG, "print(): Wrote byte: '" + c + "'");
                } catch (IOException e) {
-                       connection_failed();
-               } catch (java.lang.InterruptedException e) {
-                       connection_failed();
+                       disconnected();
+               } catch (InterruptedException e) {
+                       disconnected();
+               }
+       }
+
+       private static final int buffer_size = 1024;
+
+       private byte[] buffer = new byte[buffer_size];
+       private int buffer_len = 0;
+       private int buffer_off = 0;
+
+       public int getchar() {
+               while (buffer_off == buffer_len) {
+                       try {
+                               wait_connected();
+                               buffer_len = input.read(buffer);
+                               buffer_off = 0;
+                       } catch (IOException e) {
+                               if (D) Log.d(TAG, "getchar IOException");
+                               disconnected();
+                               return AltosLink.ERROR;
+                       } catch (java.lang.InterruptedException e) {
+                               if (D) Log.d(TAG, "getchar Interrupted");
+                               disconnected();
+                               return AltosLink.ERROR;
+                       }
                }
-               return AltosLink.ERROR;
+               return buffer[buffer_off++];
        }
 
+       public void closing() {
+               synchronized(closing_lock) {
+                       if (D) Log.d(TAG, "Marked closing true");
+                       closing = true;
+               }
+       }
+
+
        public void close() {
                if (D) Log.d(TAG, "close(): begin");
+
+               closing();
+
                synchronized(this) {
                        if (D) Log.d(TAG, "close(): synched");
 
-                       if (connect_thread != null) {
-                               if (D) Log.d(TAG, "close(): stopping connect_thread");
-                               connect_thread.cancel();
-                               connect_thread = null;
-                       }
-                       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 (socket != null) {
+                               if (D) Log.d(TAG, "close(): Closing socket");
+                               try {
+                                       socket.close();
+                               } catch (IOException e) {
+                                       if (D) Log.e(TAG, "close(): unable to close() socket");
+                               }
+                               socket = null;
                        }
+                       connect_thread = null;
                        if (input_thread != null) {
                                if (D) Log.d(TAG, "close(): stopping input_thread");
                                try {
@@ -207,6 +308,13 @@ 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