X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosBluetooth.java;h=dffa9ffb8c31c3612a907d27ef1e32a894425cf1;hb=7664ecc0003151d3f05537f17914df2bf48e4275;hp=79e31e8901ce6ddcc4de1ff998a21c157d42e0dd;hpb=b59e7d0b201290f2cb0fd494ef28c1402e11ba3b;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java index 79e31e89..dffa9ffb 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java @@ -1,6 +1,6 @@ /* - * Copyright © 2011 Keith Packard - * Copyright © 2012 Mike Beattie + * Copyright © 2011 Keith Packard + * Copyright © 2012 Mike Beattie * * 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 @@ -26,6 +26,9 @@ import java.util.UUID; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothSocket; +//import android.os.Bundle; +import android.os.Handler; +//import android.os.Message; import android.util.Log; import org.altusmetrum.AltosLib.*; @@ -37,6 +40,9 @@ public class AltosBluetooth extends AltosLink { private static final boolean D = true; private ConnectThread connect_thread = null; + private Thread input_thread = null; + + private Handler handler; private BluetoothAdapter adapter; private BluetoothDevice device; @@ -44,6 +50,17 @@ public class AltosBluetooth extends AltosLink { 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(); + + } + private class ConnectThread extends Thread { private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB"); @@ -59,41 +76,53 @@ public class AltosBluetooth extends AltosLink { } public void run() { - if (D) Log.i(TAG, "BEGIN ConnectThread"); + if (D) Log.d(TAG, "ConnectThread: BEGIN"); setName("ConnectThread"); // Always cancel discovery because it will slow down a connection adapter.cancelDiscovery(); - // 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(); - } catch (IOException e) { - // Close the socket + synchronized (AltosBluetooth.this) { + // Make a connection to the BluetoothSocket try { - socket.close(); - } catch (IOException e2) { - if (D) Log.e(TAG, "unable to close() socket during connection failure", e2); - } - connection_failed(); - return; - } + // This is a blocking call and will only return on a + // successful connection or an exception + socket.connect(); - try { - synchronized (AltosBluetooth.this) { input = socket.getInputStream(); output = socket.getOutputStream(); - - // Reset the ConnectThread because we're done - AltosBluetooth.this.notify(); - connect_thread = null; - if (D) Log.i(TAG, "Completed connect"); + } 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; } - } catch (Exception e) { - if (D) Log.e(TAG, "Failed to finish connection", e); - e.printStackTrace(); + + input_thread = new Thread(AltosBluetooth.this); + input_thread.start(); + + // Configure the newly connected device for telemetry + print("~\nE 0\n"); + set_monitor(false); + + // Let TelemetryService know we're connected + handler.obtainMessage(TelemetryService.MSG_CONNECTED).sendToTarget(); + + // Notify other waiting threads, now that we're connected + AltosBluetooth.this.notifyAll(); + + // Reset the ConnectThread because we're done + connect_thread = null; + + if (D) Log.d(TAG, "ConnectThread: Connect completed"); } } @@ -102,25 +131,30 @@ 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 { + private synchronized void wait_connected() throws InterruptedException, IOException { if (input == null) { wait(); + if (input == null) throw new IOException(); } } private void connection_failed() { + 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.d(TAG, "print(): begin"); try { wait_connected(); output.write(bytes); + if (D) Log.d(TAG, "print(): Wrote bytes: '" + data.replace('\n', '\\') + "'"); } catch (IOException e) { connection_failed(); } catch (InterruptedException e) { @@ -139,26 +173,45 @@ public class AltosBluetooth extends AltosLink { } return AltosLink.ERROR; } - + public void close() { + if (D) Log.d(TAG, "close(): begin"); 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 (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; } public void hide_reply_timeout() { } - public AltosBluetooth(BluetoothDevice device) { - adapter = BluetoothAdapter.getDefaultAdapter(); - connect_thread = new ConnectThread(device, true); - connect_thread.start(); - } -} \ No newline at end of file +}