X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosBluetooth.java;h=32b7a65bc3e45578d2459aa41b391a38cabd515e;hp=18581142efc13679a24d1768af563e538a3e4ff2;hb=7bfa8841b65707d629b425b306ec4cc3acfc156c;hpb=162c640d382b9f823573578fe97584adc94cd9b6 diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java index 18581142..32b7a65b 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 @@ -31,189 +31,180 @@ 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 { +public class AltosBluetooth extends AltosDroidLink { // Debugging private static final String TAG = "AltosBluetooth"; 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; private BluetoothSocket socket; private InputStream input; private OutputStream output; // Constructor - public AltosBluetooth(BluetoothDevice in_device, Handler in_handler) { + public AltosBluetooth(BluetoothDevice device, Handler handler) { + super(handler); +// set_debug(D); adapter = BluetoothAdapter.getDefaultAdapter(); - device = in_device; - handler = in_handler; + this.handler = handler; - connect_thread = new ConnectThread(device); + create_socket(device); + connect_thread = new ConnectThread(); connect_thread.start(); + } - input_thread = new Thread(this); - input_thread.start(); + void connected() { + if (closed()) { + if (D) Log.d(TAG, "connected after closed"); + return; + } + + try { + synchronized(this) { + if (socket != null) { + input = socket.getInputStream(); + output = socket.getOutputStream(); + super.connected(); + } + } + } catch (InterruptedException ie) { + connect_failed(); + } catch (IOException io) { + connect_failed(); + } } - private class ConnectThread extends Thread { - private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB"); + private void connect_failed() { + if (closed()) { + if (D) Log.d(TAG, "connect_failed after closed"); + return; + } + + close_device(); + input = null; + output = null; + handler.obtainMessage(TelemetryService.MSG_CONNECT_FAILED, this).sendToTarget(); + if (D) Log.e(TAG, "ConnectThread: Failed to establish connection"); + } + + void close_device() { + BluetoothSocket tmp_socket; - public ConnectThread(BluetoothDevice device) { - BluetoothSocket tmp_socket = null; + synchronized(this) { + tmp_socket = socket; + socket = null; + } + if (tmp_socket != null) { try { - tmp_socket = device.createInsecureRfcommSocketToServiceRecord(SPP_UUID); + tmp_socket.close(); } catch (IOException e) { - e.printStackTrace(); + if (D) Log.e(TAG, "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; + + 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_device(); + } + synchronized (this) { socket = tmp_socket; } + } + + private class ConnectThread extends Thread { 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 - adapter.cancelDiscovery(); + try { + adapter.cancelDiscovery(); + } catch (Exception e) { + if (D) Log.d(TAG, String.format("cancelDiscovery exception %s", e.toString())); + } + + BluetoothSocket local_socket = null; synchronized (AltosBluetooth.this) { - // Make a connection to the BluetoothSocket + if (!closed()) + local_socket = socket; + } + + if (local_socket != null) { try { + // Make a connection to the BluetoothSocket // This is a blocking call and will only return on a // successful connection or an exception - socket.connect(); - - input = socket.getInputStream(); - output = socket.getOutputStream(); + local_socket.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; + if (D) Log.d(TAG, String.format("Connect exception %s", e.toString())); + local_socket = null; } - - // 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(); - 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"); } - } - public void cancel() { - try { - if (socket != null) - socket.close(); - } catch (IOException e) { - if (D) Log.e(TAG, "ConnectThread: close() of connect socket failed", e); + if (local_socket != null) { + connected(); + } else { + connect_failed(); } + + if (D) Log.d(TAG, "ConnectThread: completed"); } } 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"); + if (input == null && socket != null) { + if (D) Log.d(TAG, "wait_connected..."); wait(); - if (D) Log.i(TAG, "wait_connected(): wait ended.."); - if (input == null) throw new IOException(); + if (D) Log.d(TAG, "wait_connected done"); } + if (socket == null) + throw new IOException(); } - private void connection_failed() { - if (D) Log.e(TAG, "Bluetooth Socket IO failed!"); - handler.obtainMessage(TelemetryService.MSG_DISCONNECTED).sendToTarget(); - } - - public void print(String data) { - byte[] bytes = data.getBytes(); - if (D) Log.i(TAG, "print(): begin"); + int write(byte[] buffer, int len) { 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) { - connection_failed(); + output.write(buffer, 0, len); + } catch (IOException ie) { + return -1; } + return len; } - public int getchar() { - if (D) Log.i(TAG, "getchar(): begin"); + int read(byte[] buffer, int len) { try { - wait_connected(); - if (D) Log.i(TAG, "getchar(): proceeding"); - return input.read(); - } catch (IOException e) { - connection_failed(); - } catch (java.lang.InterruptedException e) { - connection_failed(); + return input.read(buffer, 0, len); + } catch (IOException ie) { + return -1; } - return AltosLink.ERROR; } - 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 (D) Log.i(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"); - 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; - } - 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() { }