projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: more logical name for connection_lost() method.
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
AltosBluetooth.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index cc039206924fe682b5e994826dd4681c9ecc6556..0076fc53f9fa4b368cf06109704f87ce7bdf5cf1 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@
-1,6
+1,6
@@
/*
/*
- * Copyright
Â
© 2011 Keith Packard <keithp@keithp.com>
- * Copyright
Â
© 2012 Mike Beattie <mike@ethernal.org>
+ * Copyright © 2011 Keith Packard <keithp@keithp.com>
+ * Copyright © 2012 Mike Beattie <mike@ethernal.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-26,7
+26,9
@@
import java.util.UUID;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothSocket;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothSocket;
+//import android.os.Bundle;
import android.os.Handler;
import android.os.Handler;
+//import android.os.Message;
import android.util.Log;
import org.altusmetrum.AltosLib.*;
import android.util.Log;
import org.altusmetrum.AltosLib.*;
@@
-57,8
+59,6
@@
public class AltosBluetooth extends AltosLink {
connect_thread = new ConnectThread(device);
connect_thread.start();
connect_thread = new ConnectThread(device);
connect_thread.start();
- input_thread = new Thread(this);
- input_thread.start();
}
private class ConnectThread extends Thread {
}
private class ConnectThread extends Thread {
@@
-76,7
+76,7
@@
public class AltosBluetooth extends AltosLink {
}
public void run() {
}
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
setName("ConnectThread");
// Always cancel discovery because it will slow down a connection
@@
-101,21
+101,28
@@
public class AltosBluetooth extends AltosLink {
input = null;
output = null;
AltosBluetooth.this.notifyAll();
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;
}
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);
// Configure the newly connected device for telemetry
print("~\nE 0\n");
set_monitor(false);
- //
Reset the ConnectThread because we're done
-
connect_thread = null
;
+ //
Let TelemetryService know we're connected
+
handler.obtainMessage(TelemetryService.MSG_CONNECTED).sendToTarget()
;
// Notify other waiting threads, now that we're connected
AltosBluetooth.this.notifyAll();
// 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");
}
}
}
}
@@
-130,69
+137,65
@@
public class AltosBluetooth extends AltosLink {
}
private synchronized void wait_connected() throws InterruptedException, IOException {
}
private synchronized void wait_connected() throws InterruptedException, IOException {
- if (D) Log.i(TAG, "wait_connected(): begin");
if (input == null) {
if (input == null) {
- if (D) Log.i(TAG, "wait_connected(): waiting");
wait();
wait();
- if (D) Log.i(TAG, "wait_connected(): wait ended..");
if (input == null) throw new IOException();
}
}
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();
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);
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) {
} catch (IOException e) {
- connection_
failed
();
+ connection_
lost
();
} catch (InterruptedException e) {
} catch (InterruptedException e) {
- connection_
failed
();
+ connection_
lost
();
}
}
public int getchar() {
}
}
public int getchar() {
- if (D) Log.i(TAG, "getchar(): begin");
try {
wait_connected();
try {
wait_connected();
- if (D) Log.i(TAG, "getchar(): proceeding");
return input.read();
} catch (IOException e) {
return input.read();
} catch (IOException e) {
- connection_
failed
();
+ connection_
lost
();
} catch (java.lang.InterruptedException e) {
} catch (java.lang.InterruptedException e) {
- connection_
failed
();
+ connection_
lost
();
}
return AltosLink.ERROR;
}
}
return AltosLink.ERROR;
}
-
+
public void close() {
public void close() {
- if (D) Log.
i
(TAG, "close(): begin");
+ if (D) Log.
d
(TAG, "close(): begin");
synchronized(this) {
synchronized(this) {
- if (D) Log.
i
(TAG, "close(): synched");
+ if (D) Log.
d
(TAG, "close(): synched");
if (connect_thread != null) {
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;
}
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) {
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 {
try {
- if (D) Log.
i
(TAG, "close(): input_thread.interrupt().....");
+ if (D) Log.
d
(TAG, "close(): input_thread.interrupt().....");
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;
input_thread.join();
} catch (Exception e) {}
input_thread = null;
@@
-206,6
+209,7
@@
public class AltosBluetooth extends AltosLink {
//public void flush_output() { super.flush_output(); }
//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() { }
public boolean can_cancel_reply() { return false; }
public boolean show_reply_timeout() { return true; }
public void hide_reply_timeout() { }