X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosBluetooth.java;h=03ae5cb84a55281bb3fb5046d0809293e06a5f7f;hp=c16e3cf5bc8365d57d1a63de86ad6dff6eb71dc3;hb=2509b664df6a13e6ae9e6753dc9fa0d696a4f6c7;hpb=fe6680dd3b4c31b3d4edc3f06a142f02bcb879df diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java index c16e3cf5..03ae5cb8 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java @@ -26,159 +26,196 @@ import java.util.UUID; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothSocket; -import android.util.Log; +//import android.os.Bundle; +import android.os.Handler; +//import android.os.Message; -import org.altusmetrum.AltosLib.*; +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 BluetoothAdapter adapter; - private BluetoothDevice device; + private BluetoothDevice device; private BluetoothSocket socket; private InputStream input; private OutputStream output; + private boolean pause; // Constructor - public AltosBluetooth(BluetoothDevice in_device) { - adapter = BluetoothAdapter.getDefaultAdapter(); - device = in_device; + public AltosBluetooth(BluetoothDevice device, Handler handler, boolean pause) { + super(handler); + this.device = device; + this.handler = handler; + this.pause = pause; - connect_thread = new ConnectThread(device); + connect_thread = new ConnectThread(); connect_thread.start(); + } + + void connected() { + if (closed()) { + AltosDebug.debug("connected after closed"); + return; + } - input_thread = new Thread(this); - input_thread.start(); + AltosDebug.check_ui("connected\n"); + 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()) { + AltosDebug.debug("connect_failed after closed"); + return; + } - public ConnectThread(BluetoothDevice device) { - BluetoothSocket tmp_socket = null; + close_device(); + input = null; + output = null; + handler.obtainMessage(TelemetryService.MSG_CONNECT_FAILED, this).sendToTarget(); + AltosDebug.error("ConnectThread: Failed to establish connection"); + } + + void close_device() { + BluetoothSocket tmp_socket; + 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(); + 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) { + AltosDebug.debug("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, "BEGIN ConnectThread"); + AltosDebug.debug("ConnectThread: BEGIN (pause %b)", pause); 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 + if (pause) { try { - socket.close(); - } catch (IOException e2) { - if (D) Log.e(TAG, "unable to close() socket during connection failure", e2); + Thread.sleep(4000); + } catch (InterruptedException e) { } - connection_failed(); - return; } + create_socket(device); + // Always cancel discovery because it will slow down a connection try { - synchronized (AltosBluetooth.this) { - input = socket.getInputStream(); - output = socket.getOutputStream(); + BluetoothAdapter.getDefaultAdapter().cancelDiscovery(); + } catch (Exception e) { + AltosDebug.debug("cancelDiscovery exception %s", e.toString()); + } + + BluetoothSocket local_socket = null; - // Configure the newly connected device for telemetry - print("~\nE 0\n"); - set_monitor(false); + synchronized (AltosBluetooth.this) { + if (!closed()) + local_socket = socket; + } - // Reset the ConnectThread because we're done - AltosBluetooth.this.notify(); - connect_thread = null; - if (D) Log.i(TAG, "Completed connect"); + 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 + local_socket.connect(); + } 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; } - } catch (Exception e) { - if (D) Log.e(TAG, "Failed to finish connection", e); - e.printStackTrace(); } - } - public void cancel() { - try { - if (socket != null) - socket.close(); - } catch (IOException e) { - if (D) Log.e(TAG, "close() of connect socket failed", e); + if (local_socket != null) { + connected(); + } else { + connect_failed(); } + + AltosDebug.debug("ConnectThread: completed"); } } - private synchronized void wait_connected() throws InterruptedException { - if (input == null) { + private synchronized void wait_connected() throws InterruptedException, IOException { + AltosDebug.check_ui("wait_connected\n"); + if (input == null && socket != null) { + AltosDebug.debug("wait_connected..."); wait(); + AltosDebug.debug("wait_connected done"); } + if (socket == null) + throw new IOException(); } - private void connection_failed() { - if (D) Log.i(TAG, "Bluetooth Connection failed!"); - } - - public void print(String data) { - byte[] bytes = data.getBytes(); + int write(byte[] buffer, int len) { try { - if (D) Log.i(TAG, "Entering print();"); - wait_connected(); - output.write(bytes); - if (D) Log.i(TAG, "Writing bytes: '" + data + "'"); - } 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() { + int read(byte[] buffer, int len) { try { - wait_connected(); - 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() { - synchronized(this) { - if (connect_thread != null) { - connect_thread.cancel(); - connect_thread = null; - } - if (input_thread != null) { - try { - input_thread.interrupt(); - input_thread.join(); - } catch (Exception e) {} - input_thread = null; - } - } - } - - - //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() { }