X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosBluetooth.java;h=d506ff59cc4702e2d2fa8561330af5289edb2b8e;hp=a599698faaeb3f37604e23591957e9ab559f675f;hb=bca342577740a9d04b8419ecadcff582e77f1e61;hpb=bd440afc2a6e37b74fffcf1b977e149485095316

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index a599698f..d506ff59 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@ -31,204 +31,187 @@ import android.os.Handler;
 //import android.os.Message;
 import android.util.Log;
 
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_7.*;
 
-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 BluetoothDevice	 device;
 	private BluetoothSocket  socket;
 	private InputStream      input;
 	private OutputStream     output;
+	private boolean		 pause;
 
 	// Constructor
-	public AltosBluetooth(BluetoothDevice in_device, Handler in_handler) {
-		adapter = BluetoothAdapter.getDefaultAdapter();
-		device = in_device;
-		handler = in_handler;
+	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();
-
 	}
 
-	private class ConnectThread extends Thread {
-		private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
-
-		public ConnectThread(BluetoothDevice device) {
-			BluetoothSocket tmp_socket = null;
-
-			try {
-				tmp_socket = device.createInsecureRfcommSocketToServiceRecord(SPP_UUID);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			socket = tmp_socket;
+	void connected() {
+		if (closed()) {
+			if (D) Log.d(TAG, "connected after closed");
+			return;
 		}
 
-		public void run() {
-			if (D) Log.d(TAG, "ConnectThread: BEGIN");
-			setName("ConnectThread");
-
-			// Always cancel discovery because it will slow down a connection
-			adapter.cancelDiscovery();
-
-			synchronized (AltosBluetooth.this) {
-				// 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();
-
+		AltosDebug.check_ui("connected\n");
+		try {
+			synchronized(this) {
+				if (socket != null) {
 					input = socket.getInputStream();
 					output = socket.getOutputStream();
-				} 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;
+					super.connected();
 				}
+			}
+		} catch (InterruptedException ie) {
+			connect_failed();
+		} catch (IOException io) {
+			connect_failed();
+		}
+	}
 
-				input_thread = new Thread(AltosBluetooth.this);
-				input_thread.start();
-
-				// Configure the newly connected device for telemetry
-				print("~\nE 0\n");
-				set_monitor(false);
-
-				// Let TelemetryService know we're connected
-				handler.obtainMessage(TelemetryService.MSG_CONNECTED).sendToTarget();
+	private void connect_failed() {
+		if (closed()) {
+			if (D) Log.d(TAG, "connect_failed after closed");
+			return;
+		}
 
-				// Notify other waiting threads, now that we're connected
-				AltosBluetooth.this.notifyAll();
+		close_device();
+		input = null;
+		output = null;
+		handler.obtainMessage(TelemetryService.MSG_CONNECT_FAILED, this).sendToTarget();
+		if (D) Log.e(TAG, "ConnectThread: Failed to establish connection");
+	}
 
-				// Reset the ConnectThread because we're done
-				connect_thread = null;
+	void close_device() {
+		BluetoothSocket	tmp_socket;
 
-				if (D) Log.d(TAG, "ConnectThread: Connect completed");
-			}
+		synchronized(this) {
+			tmp_socket = socket;
+			socket = null;
 		}
 
-		public void cancel() {
+		if (tmp_socket != null) {
 			try {
-				if (socket != null)
-					socket.close();
+				tmp_socket.close();
 			} catch (IOException e) {
-				if (D) Log.e(TAG, "ConnectThread: close() of connect socket failed", e);
+				if (D) Log.e(TAG, "close_socket failed");
 			}
 		}
 	}
 
-	private synchronized void wait_connected() throws InterruptedException, IOException {
-		if (input == null) {
-			wait();
-			if (input == null) throw new IOException();
-		}
+	public void close() {
+		super.close();
+		input = null;
+		output = null;
 	}
 
-	private void connection_lost() {
-		if (D) Log.e(TAG, "Connection lost during I/O");
-		handler.obtainMessage(TelemetryService.MSG_DISCONNECTED).sendToTarget();
-	}
+	private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
 
-	public void print(String data) {
-		byte[] bytes = data.getBytes();
-		if (D) Log.d(TAG, "print(): begin");
-		try {
-			wait_connected();
-			output.write(bytes);
-			if (D) Log.d(TAG, "print(): Wrote bytes: '" + data.replace('\n', '\\') + "'");
-		} catch (IOException e) {
-			connection_lost();
-		} catch (InterruptedException e) {
-			connection_lost();
-		}
-	}
+	private void create_socket(BluetoothDevice  device) {
 
-	public void putchar(byte c) {
-		byte[] bytes = { c };
-		if (D) Log.d(TAG, "print(): begin");
-		try {
-			wait_connected();
-			output.write(bytes);
-			if (D) Log.d(TAG, "print(): Wrote byte: '" + c + "'");
-		} catch (IOException e) {
-			connection_lost();
-		} catch (InterruptedException e) {
-			connection_lost();
-		}
-	}		
+		BluetoothSocket tmp_socket = null;
 
-	public int getchar() {
 		try {
-			wait_connected();
-			return input.read();
+			tmp_socket = device.createInsecureRfcommSocketToServiceRecord(SPP_UUID);
 		} catch (IOException e) {
-			connection_lost();
-		} catch (java.lang.InterruptedException e) {
-			connection_lost();
+			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;
 		}
-		return AltosLink.ERROR;
 	}
 
-	public void close() {
-		if (D) Log.d(TAG, "close(): begin");
-		synchronized(this) {
-			if (D) Log.d(TAG, "close(): synched");
+	private class ConnectThread extends Thread {
+
+		public void run() {
+			if (D) Log.d(TAG, "ConnectThread: BEGIN");
+			setName("ConnectThread");
 
-			if (connect_thread != null) {
-				if (D) Log.d(TAG, "close(): stopping connect_thread");
-				connect_thread.cancel();
-				connect_thread = null;
+			if (pause) {
+				try {
+					Thread.sleep(4000);
+				} catch (InterruptedException e) {
+				}
 			}
-			if (D) Log.d(TAG, "close(): Closing socket");
+
+			create_socket(device);
+			// Always cancel discovery because it will slow down a connection
 			try {
-				socket.close();
-			} catch (IOException e) {
-				if (D) Log.e(TAG, "close(): unable to close() socket");
+				BluetoothAdapter.getDefaultAdapter().cancelDiscovery();
+			} catch (Exception e) {
+				if (D) Log.d(TAG, String.format("cancelDiscovery exception %s", e.toString()));
 			}
-			if (input_thread != null) {
-				if (D) Log.d(TAG, "close(): stopping input_thread");
+
+			BluetoothSocket	local_socket = null;
+
+			synchronized (AltosBluetooth.this) {
+				if (!closed())
+					local_socket = socket;
+			}
+
+			if (local_socket != null) {
 				try {
-					if (D) Log.d(TAG, "close(): input_thread.interrupt().....");
-					input_thread.interrupt();
-					if (D) Log.d(TAG, "close(): input_thread.join().....");
-					input_thread.join();
-				} catch (Exception e) {}
-				input_thread = null;
+					// 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 (IOException e) {
+					if (D) Log.d(TAG, String.format("Connect exception %s", e.toString()));
+					local_socket = null;
+				}
 			}
-			input = null;
-			output = null;
-			notifyAll();
+
+			if (local_socket != null) {
+				connected();
+			} else {
+				connect_failed();
+			}
+
+			if (D) Log.d(TAG, "ConnectThread: completed");
 		}
 	}
 
+	private synchronized void wait_connected() throws InterruptedException, IOException {
+		if (input == null && socket != null) {
+			if (D) Log.d(TAG, "wait_connected...");
+			wait();
+			if (D) Log.d(TAG, "wait_connected done");
+		}
+		if (socket == null)
+			throw new IOException();
+	}
 
-	// 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);
+	int write(byte[] buffer, int len) {
+		try {
+			output.write(buffer, 0, len);
+		} catch (IOException ie) {
+			return -1;
+		}
+		return len;
 	}
 
-	//public void flush_output() { super.flush_output(); }
+	int read(byte[] buffer, int len) {
+		try {
+			return input.read(buffer, 0, len);
+		} catch (IOException ie) {
+			return -1;
+		}
+	}
 
 	// Stubs of required methods when extending AltosLink
 	public boolean can_cancel_reply()   { return false; }