X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosBluetooth.java;h=3071c8f19ac5ef8b3c7cafc7871366637ec3cc4a;hb=d95b84b56c63002788939b93b6ce949d921a4892;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..3071c8f1 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@ -26,6 +26,7 @@ import java.util.UUID;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
+import android.os.Handler;
 import android.util.Log;
 
 import org.altusmetrum.AltosLib.*;
@@ -37,6 +38,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 +48,19 @@ 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();
+
+		input_thread = new Thread(this);
+		input_thread.start();
+	}
+
 	private class ConnectThread extends Thread {
 		private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
 
@@ -59,7 +76,7 @@ public class AltosBluetooth extends AltosLink {
 		}
 
 		public void run() {
-			if (D) Log.i(TAG, "BEGIN ConnectThread");
+			if (D) Log.i(TAG, "ConnectThread: BEGIN");
 			setName("ConnectThread");
 
 			// Always cancel discovery because it will slow down a connection
@@ -86,6 +103,10 @@ public class AltosBluetooth extends AltosLink {
 					input = socket.getInputStream();
 					output = socket.getOutputStream();
 
+					// Configure the newly connected device for telemetry
+					print("~\nE 0\n");
+					set_monitor(false);
+
 					// Reset the ConnectThread because we're done
 					AltosBluetooth.this.notify();
 					connect_thread = null;
@@ -102,25 +123,31 @@ 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 {
+		if (D) Log.i(TAG, "wait_connected(): begin");
 		if (input == null) {
+			if (D) Log.i(TAG, "wait_connected(): waiting");
 			wait();
+			if (D) Log.i(TAG, "wait_connected(): wait ended..");
 		}
 	}
 
 	private void connection_failed() {
+		if (D) Log.e(TAG, "Bluetooth Socket IO failed!");
 	}
 	
 	public void print(String data) {
 		byte[] bytes = data.getBytes();
+		if (D) Log.i(TAG, "print(): begin");
 		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) {
@@ -129,8 +156,10 @@ public class AltosBluetooth extends AltosLink {
 	}
 
 	public int getchar() {
+		if (D) Log.i(TAG, "getchar(): begin");
 		try {
 			wait_connected();
+			if (D) Log.i(TAG, "getchar(): proceeding");
 			return input.read();
 		} catch (IOException e) {
 			connection_failed();
@@ -141,11 +170,25 @@ public class AltosBluetooth extends AltosLink {
 	}
 			
 	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 (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;
+			}
 		}
 	}
 
@@ -156,9 +199,4 @@ public class AltosBluetooth extends AltosLink {
 	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
+}