projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Move pause before reopening bluetooth into connec thread
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
TelemetryReader.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
index 45604284e0767a405de80b2f5d6b8c66d77cb24a..3f31fa6b0c919d692864d094ff674b3cb4be8cec 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@
-25,12
+25,13
@@
import java.util.concurrent.*;
import android.util.Log;
import android.os.Handler;
import android.util.Log;
import android.os.Handler;
-import org.altusmetrum.altoslib_
2
.*;
+import org.altusmetrum.altoslib_
7
.*;
public class TelemetryReader extends Thread {
private static final String TAG = "TelemetryReader";
public class TelemetryReader extends Thread {
private static final String TAG = "TelemetryReader";
+ private static final boolean D = true;
int crc_errors;
int crc_errors;
@@
-66,7
+67,8
@@
public class TelemetryReader extends Thread {
AltosState state = null;
try {
AltosState state = null;
try {
- for (;;) {
+ if (D) Log.d(TAG, "starting loop");
+ while (telemQueue != null) {
try {
state = read();
handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();
try {
state = read();
handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();
@@
-79,17
+81,23
@@
public class TelemetryReader extends Thread {
}
} catch (InterruptedException ee) {
} catch (IOException ie) {
}
} catch (InterruptedException ee) {
} catch (IOException ie) {
+ Log.e(TAG, "IO exception in telemetry reader");
+ handler.obtainMessage(TelemetryService.MSG_DISCONNECTED, link).sendToTarget();
} finally {
close();
}
}
} finally {
close();
}
}
- public TelemetryReader (AltosLink in_link, Handler in_handler) {
+ public TelemetryReader (AltosLink in_link, Handler in_handler, AltosState in_state) {
+ if (D) Log.d(TAG, "connected TelemetryReader create started");
link = in_link;
handler = in_handler;
link = in_link;
handler = in_handler;
- state =
null
;
+ state =
in_state
;
telemQueue = new LinkedBlockingQueue<AltosLine>();
link.add_monitor(telemQueue);
telemQueue = new LinkedBlockingQueue<AltosLine>();
link.add_monitor(telemQueue);
+ link.set_telemetry(AltosLib.ao_telemetry_standard);
+
+ if (D) Log.d(TAG, "connected TelemetryReader created");
}
}
}
}