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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index 4c3f979d..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.*;
@@ -39,6 +40,8 @@ public class AltosBluetooth extends AltosLink {
 	private ConnectThread    connect_thread = null;
 	private Thread           input_thread   = null;
 
+	private Handler          handler;
+
 	private BluetoothAdapter adapter;
 	private BluetoothDevice  device;
 	private BluetoothSocket  socket;
@@ -46,9 +49,10 @@ public class AltosBluetooth extends AltosLink {
 	private OutputStream     output;
 
 	// Constructor
-	public AltosBluetooth(BluetoothDevice in_device) {
+	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();
@@ -99,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;
@@ -127,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) {