altosdroid: Centralize debug printf code
[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosBluetooth.java
index da75ffddaf5ffdbd0a8c82049a16cba7f650e751..03ae5cb84a55281bb3fb5046d0809293e06a5f7f 100644 (file)
@@ -29,75 +29,47 @@ import android.bluetooth.BluetoothSocket;
 //import android.os.Bundle;
 import android.os.Handler;
 //import android.os.Message;
-import android.util.Log;
 
-import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altoslib_7.*;
 
-public class AltosBluetooth extends AltosLink {
-
-       // Debugging
-       private static final String TAG = "AltosBluetooth";
-       private static final boolean D = true;
+public class AltosBluetooth extends AltosDroidLink {
 
        private ConnectThread    connect_thread = null;
-       private Thread           input_thread   = null;
-
-       private Handler          handler;
 
-       private BluetoothAdapter adapter;
+       private BluetoothDevice  device;
        private BluetoothSocket  socket;
        private InputStream      input;
        private OutputStream     output;
+       private boolean          pause;
 
        // Constructor
-       public AltosBluetooth(BluetoothDevice device, Handler handler) {
-//             set_debug(D);
-               adapter = BluetoothAdapter.getDefaultAdapter();
+       public AltosBluetooth(BluetoothDevice device, Handler handler, boolean pause) {
+               super(handler);
+               this.device = device;
                this.handler = handler;
+               this.pause = pause;
 
-               create_socket(device);
                connect_thread = new ConnectThread();
                connect_thread.start();
        }
 
-       private Object closed_lock = new Object();
-       private boolean closed = false;
-
-       private boolean closed() {
-               synchronized(closed_lock) {
-                       return closed;
-               }
-       }
-
-       private void connected() {
+       void connected() {
                if (closed()) {
-                       if (D) Log.d(TAG, "connected after closed");
+                       AltosDebug.debug("connected after closed");
                        return;
                }
 
+               AltosDebug.check_ui("connected\n");
                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, this).sendToTarget();
-
-                                       /* Notify other waiting threads that we're connected now
-                                        */
-                                       notifyAll();
+                                       super.connected();
                                }
                        }
+               } catch (InterruptedException ie) {
+                       connect_failed();
                } catch (IOException io) {
                        connect_failed();
                }
@@ -105,28 +77,18 @@ public class AltosBluetooth extends AltosLink {
 
        private void connect_failed() {
                if (closed()) {
-                       if (D) Log.d(TAG, "connect_failed after closed");
+                       AltosDebug.debug("connect_failed after closed");
                        return;
                }
 
-               close_socket();
+               close_device();
                input = null;
                output = null;
                handler.obtainMessage(TelemetryService.MSG_CONNECT_FAILED, this).sendToTarget();
-               if (D) Log.e(TAG, "ConnectThread: Failed to establish connection");
-       }
-
-       private void disconnected() {
-               if (closed()) {
-                       if (D) Log.d(TAG, "disconnected after closed");
-                       return;
-               }
-
-               if (D) Log.d(TAG, "Sending disconnected message");
-               handler.obtainMessage(TelemetryService.MSG_DISCONNECTED, this).sendToTarget();
+               AltosDebug.error("ConnectThread: Failed to establish connection");
        }
 
-       private void close_socket() {
+       void close_device() {
                BluetoothSocket tmp_socket;
 
                synchronized(this) {
@@ -138,25 +100,32 @@ public class AltosBluetooth extends AltosLink {
                        try {
                                tmp_socket.close();
                        } catch (IOException e) {
-                               if (D) Log.e(TAG, "close_socket failed");
+                               AltosDebug.error("close_socket failed");
                        }
                }
        }
 
+       public void close() {
+               super.close();
+               input = null;
+               output = null;
+       }
+
        private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
 
        private void create_socket(BluetoothDevice  device) {
 
                BluetoothSocket tmp_socket = null;
 
+               AltosDebug.check_ui("create_socket\n");
                try {
                        tmp_socket = device.createInsecureRfcommSocketToServiceRecord(SPP_UUID);
                } catch (IOException e) {
                        e.printStackTrace();
                }
                if (socket != null) {
-                       if (D) Log.d(TAG, String.format("Socket already allocated %s", socket.toString()));
-                       close_socket();
+                       AltosDebug.debug("Socket already allocated %s", socket.toString());
+                       close_device();
                }
                synchronized (this) {
                        socket = tmp_socket;
@@ -166,14 +135,22 @@ public class AltosBluetooth extends AltosLink {
        private class ConnectThread extends Thread {
 
                public void run() {
-                       if (D) Log.d(TAG, "ConnectThread: BEGIN");
+                       AltosDebug.debug("ConnectThread: BEGIN (pause %b)", pause);
                        setName("ConnectThread");
 
+                       if (pause) {
+                               try {
+                                       Thread.sleep(4000);
+                               } catch (InterruptedException e) {
+                               }
+                       }
+
+                       create_socket(device);
                        // Always cancel discovery because it will slow down a connection
                        try {
-                               adapter.cancelDiscovery();
+                               BluetoothAdapter.getDefaultAdapter().cancelDiscovery();
                        } catch (Exception e) {
-                               if (D) Log.d(TAG, String.format("cancelDiscovery exception %s", e.toString()));
+                               AltosDebug.debug("cancelDiscovery exception %s", e.toString());
                        }
 
                        BluetoothSocket local_socket = null;
@@ -189,8 +166,13 @@ public class AltosBluetooth extends AltosLink {
                                        // This is a blocking call and will only return on a
                                        // successful connection or an exception
                                        local_socket.connect();
-                               } catch (IOException e) {
-                                       if (D) Log.d(TAG, String.format("Connect exception %s", e.toString()));
+                               } catch (Exception e) {
+                                       AltosDebug.debug("Connect exception %s", e.toString());
+                                       try {
+                                               local_socket.close();
+                                       } catch (Exception ce) {
+                                               AltosDebug.debug("Close exception %s", ce.toString());
+                                       }
                                        local_socket = null;
                                }
                        }
@@ -201,139 +183,38 @@ public class AltosBluetooth extends AltosLink {
                                connect_failed();
                        }
 
-                       if (D) Log.d(TAG, "ConnectThread: completed");
+                       AltosDebug.debug("ConnectThread: completed");
                }
        }
 
-       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 {
+               AltosDebug.check_ui("wait_connected\n");
                if (input == null && socket != null) {
-                       if (D) Log.d(TAG, "wait_connected...");
+                       AltosDebug.debug("wait_connected...");
                        wait();
-                       if (D) Log.d(TAG, "wait_connected done");
+                       AltosDebug.debug("wait_connected done");
                }
                if (socket == null)
                        throw new IOException();
        }
 
-       public void print(String data) {
-               byte[] bytes = data.getBytes();
-               if (D) Log.d(TAG, "print(): begin");
+       int write(byte[] buffer, int len) {
                try {
-                       wait_connected();
-                       output.write(bytes);
-                       if (D) Log.d(TAG, "print(): Wrote bytes: '" + data.replace('\n', '\\') + "'");
-               } catch (IOException e) {
-                       disconnected();
-               } catch (InterruptedException e) {
-                       disconnected();
+                       output.write(buffer, 0, len);
+               } catch (IOException ie) {
+                       return -1;
                }
+               return len;
        }
 
-       public void putchar(byte c) {
-               byte[] bytes = { c };
-               if (D) Log.d(TAG, "print(): begin");
+       int read(byte[] buffer, int len) {
                try {
-                       wait_connected();
-                       output.write(bytes);
-                       if (D) Log.d(TAG, "print(): Wrote byte: '" + c + "'");
-               } catch (IOException e) {
-                       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;
-
-       private byte[] debug_chars = new byte[buffer_size];
-       private int debug_off;
-
-       private void debug_input(byte b) {
-               if (b == '\n') {
-                       Log.d(TAG, "            " + new String(debug_chars, 0, debug_off));
-                       debug_off = 0;
-               } else {
-                       if (debug_off < buffer_size)
-                               debug_chars[debug_off++] = b;
-               }
-       }
-
-       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 input.read(buffer, 0, len);
+               } catch (IOException ie) {
+                       return -1;
                }
-               if (D)
-                       debug_input(buffer[buffer_off]);
-               return buffer[buffer_off++];
        }
 
-       public void closing() {
-               synchronized(closed_lock) {
-                       if (D) Log.d(TAG, "Marked closed true");
-                       closed = true;
-               }
-       }
-
-
-       public void close() {
-               if (D) Log.d(TAG, "close(): begin");
-
-               closing();
-
-               close_socket();
-
-               synchronized(this) {
-
-                       if (input_thread != null) {
-                               if (D) Log.d(TAG, "close(): stopping input_thread");
-                               try {
-                                       if (D) Log.d(TAG, "close(): input_thread.interrupt().....");
-                                       input_thread.interrupt();
-                                       if (D) Log.d(TAG, "close(): input_thread.join().....");
-                                       input_thread.join();
-                               } catch (Exception e) {}
-                               input_thread = null;
-                       }
-                       input = null;
-                       output = null;
-                       notifyAll();
-               }
-       }
-
-       //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; }