X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosBluetooth.java;h=3bfa3488c8a25337de736e0b8a4b022125531468;hb=a9ec3c96288b7ea4e40586321a0a98edf0c8fee5;hp=1f0946799d71549c35e19ffb2a78b24752d385a6;hpb=bad155538c4630c62ade80afd20830aad37c287e;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index 1f094679..3bfa3488 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.*;
@@ -36,17 +37,29 @@ public class AltosBluetooth extends AltosLink {
 	private static final String TAG = "AltosBluetooth";
 	private static final boolean D = true;
 
-	/**
-	 * This thread runs while attempting to make an outgoing connection
-	 * with a device. It runs straight through; the connection either
-	 * succeeds or fails.
-	 */
+	private ConnectThread    connect_thread = null;
+	private Thread           input_thread   = null;
 
-	private BluetoothAdapter	adapter;
-	private ConnectThread		connect_thread;
-	private BluetoothSocket		socket;
-	private InputStream		input;
-	private OutputStream		output;
+	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) {
+		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");
@@ -90,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;
@@ -118,13 +135,16 @@ public class AltosBluetooth extends AltosLink {
 	}
 
 	private void connection_failed() {
+		if (D) Log.i(TAG, "Bluetooth Connection failed!");
 	}
 	
 	public void print(String data) {
 		byte[] bytes = data.getBytes();
 		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) {
@@ -150,27 +170,21 @@ public class AltosBluetooth extends AltosLink {
 				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();
-		/* any local work needed to flush bluetooth? */
-	}
 
-	public boolean can_cancel_reply() {
-		return false;
-	}
-	public boolean show_reply_timeout() {
-		return true;
-	}
-		
-	public void hide_reply_timeout() {
-	}
+	//public void flush_output() { super.flush_output(); }
 
-	public AltosBluetooth(BluetoothDevice device) {
-		adapter = BluetoothAdapter.getDefaultAdapter();
-		connect_thread = new ConnectThread(device, true);
-		connect_thread.start();
-	}
-}
\ No newline at end of file
+	public boolean can_cancel_reply()   { return false; }
+	public boolean show_reply_timeout() { return true; }
+	public void hide_reply_timeout()    { }
+
+}