projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Centralize debug printf code
[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..7b29fe44a2f91a9742652f89dcc6c9b96f3d431a 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@
-22,16
+22,13
@@
package org.altusmetrum.AltosDroid;
import java.text.*;
import java.io.*;
import java.util.concurrent.*;
import java.text.*;
import java.io.*;
import java.util.concurrent.*;
-import android.util.Log;
import android.os.Handler;
import android.os.Handler;
-import org.altusmetrum.altoslib_
2
.*;
+import org.altusmetrum.altoslib_
7
.*;
public class TelemetryReader extends Thread {
public class TelemetryReader extends Thread {
- private static final String TAG = "TelemetryReader";
-
int crc_errors;
Handler handler;
int crc_errors;
Handler handler;
@@
-66,12
+63,13
@@
public class TelemetryReader extends Thread {
AltosState state = null;
try {
AltosState state = null;
try {
- for (;;) {
+ AltosDebug.debug("starting loop");
+ while (telemQueue != null) {
try {
state = read();
handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();
} catch (ParseException pp) {
try {
state = read();
handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();
} catch (ParseException pp) {
-
Log.e(TAG, String.format("Parse error: %d \"%s\"", pp.getErrorOffset(), pp.getMessage()
));
+
AltosDebug.error("Parse error: %d \"%s\"", pp.getErrorOffset(), pp.getMessage(
));
} catch (AltosCRCException ce) {
++crc_errors;
handler.obtainMessage(TelemetryService.MSG_CRC_ERROR, new Integer(crc_errors)).sendToTarget();
} catch (AltosCRCException ce) {
++crc_errors;
handler.obtainMessage(TelemetryService.MSG_CRC_ERROR, new Integer(crc_errors)).sendToTarget();
@@
-79,17
+77,23
@@
public class TelemetryReader extends Thread {
}
} catch (InterruptedException ee) {
} catch (IOException ie) {
}
} catch (InterruptedException ee) {
} catch (IOException ie) {
+ AltosDebug.error("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) {
+ AltosDebug.debug("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);
+
+ AltosDebug.debug("connected TelemetryReader created");
}
}
}
}