X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosBluetooth.java;h=51ef5e94652d2c2dfe47a3d0b774497d873a1f7c;hp=278c6a5336b1298f807a536587382bb923a5380d;hb=3842735e303f0bf6f46ed8cb659c92d8bb9bd137;hpb=f8211fee3c8a5de6925eadca2679441801ac793e diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java index 278c6a53..51ef5e94 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java @@ -26,12 +26,12 @@ import java.util.UUID; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothSocket; -import android.os.Bundle; +//import android.os.Bundle; import android.os.Handler; -import android.os.Message; +//import android.os.Message; import android.util.Log; -import org.altusmetrum.AltosLib.*; +import org.altusmetrum.altoslib_5.*; 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,6 @@ public class AltosBluetooth extends AltosLink { connect_thread = new ConnectThread(device); connect_thread.start(); - input_thread = new Thread(this); - input_thread.start(); } private class ConnectThread extends Thread { @@ -78,7 +77,7 @@ public class AltosBluetooth extends AltosLink { } 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 @@ -103,29 +102,28 @@ public class AltosBluetooth extends AltosLink { 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; } + input_thread = new Thread(AltosBluetooth.this); + input_thread.start(); + // 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(); - Message msg = handler.obtainMessage(TelemetryService.MSG_CONNECTED); - Bundle b = new Bundle(); - b.putString(TelemetryService.KEY_DEVNAME, name); - msg.setData(b); - handler.sendMessage(msg); + // Let TelemetryService know we're connected + 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"); + // Reset the ConnectThread because we're done + connect_thread = null; + + if (D) Log.d(TAG, "ConnectThread: Connect completed"); } } @@ -139,70 +137,109 @@ public class AltosBluetooth extends AltosLink { } } + 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 (D) Log.i(TAG, "wait_connected(): begin"); if (input == null) { - if (D) Log.i(TAG, "wait_connected(): waiting"); + if (D) Log.d(TAG, "wait_connected..."); wait(); - if (D) Log.i(TAG, "wait_connected(): wait ended.."); + if (D) Log.d(TAG, "wait_connected done"); if (input == null) throw new IOException(); } } - private void connection_failed() { - if (D) Log.e(TAG, "Bluetooth Socket IO failed!"); + private void connection_lost() { + 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.i(TAG, "print(): begin"); + if (D) Log.d(TAG, "print(): begin"); try { wait_connected(); output.write(bytes); - if (D) Log.i(TAG, "print(): Wrote bytes: '" + data.replace('\n', '\\') + "'"); + if (D) Log.d(TAG, "print(): Wrote bytes: '" + data.replace('\n', '\\') + "'"); } catch (IOException e) { - connection_failed(); + connection_lost(); } catch (InterruptedException e) { - connection_failed(); + connection_lost(); } } - public int getchar() { - if (D) Log.i(TAG, "getchar(): begin"); + public void putchar(byte c) { + byte[] bytes = { c }; + if (D) Log.d(TAG, "print(): begin"); try { wait_connected(); - if (D) Log.i(TAG, "getchar(): proceeding"); - 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(); + connection_lost(); + } catch (InterruptedException e) { + connection_lost(); } - return AltosLink.ERROR; } - + + 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) { + connection_lost(); + return AltosLink.ERROR; + } catch (java.lang.InterruptedException e) { + connection_lost(); + return AltosLink.ERROR; + } + } + return buffer[buffer_off++]; + } + public void close() { - if (D) Log.i(TAG, "close(): begin"); + if (D) Log.d(TAG, "close(): begin"); synchronized(this) { - if (D) Log.i(TAG, "close(): synched"); + if (D) Log.d(TAG, "close(): synched"); if (connect_thread != null) { - if (D) Log.i(TAG, "close(): stopping connect_thread"); + if (D) Log.d(TAG, "close(): stopping connect_thread"); connect_thread.cancel(); connect_thread = null; } - if (D) Log.i(TAG, "close(): Closing socket"); + 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.i(TAG, "close(): stopping input_thread"); + if (D) Log.d(TAG, "close(): stopping input_thread"); try { - if (D) Log.i(TAG, "close(): input_thread.interrupt()....."); + if (D) Log.d(TAG, "close(): input_thread.interrupt()....."); input_thread.interrupt(); - if (D) Log.i(TAG, "close(): input_thread.join()....."); + if (D) Log.d(TAG, "close(): input_thread.join()....."); input_thread.join(); } catch (Exception e) {} input_thread = null; @@ -214,8 +251,16 @@ 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 public boolean can_cancel_reply() { return false; } public boolean show_reply_timeout() { return true; } public void hide_reply_timeout() { }