projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Fix offline map messages to match new meanings
[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 5bc4b90dd9e417ec4901611e9b2b0b10ea968ac4..5cfa647bd5b4bf7fec78695f541ad7c678e674db 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@
-4,7
+4,8
@@
*
* 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
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-21,41
+22,32
@@
package org.altusmetrum.AltosDroid;
import java.text.*;
import java.io.*;
import java.text.*;
import java.io.*;
+import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.*;
-import android.util.Log;
import android.os.Handler;
import android.os.Handler;
-import org.altusmetrum.altoslib_
4
.*;
+import org.altusmetrum.altoslib_
13
.*;
public class TelemetryReader extends Thread {
public class TelemetryReader extends Thread {
- private static final String TAG = "TelemetryReader";
-
int crc_errors;
Handler handler;
AltosLink link;
int crc_errors;
Handler handler;
AltosLink link;
- AltosState state = null;
LinkedBlockingQueue<AltosLine> telemQueue;
LinkedBlockingQueue<AltosLine> telemQueue;
- public Altos
State
read() throws ParseException, AltosCRCException, InterruptedException, IOException {
+ public Altos
Telemetry
read() throws ParseException, AltosCRCException, InterruptedException, IOException {
AltosLine l = telemQueue.take();
if (l.line == null)
throw new IOException("IO error");
AltosTelemetry telem = AltosTelemetryLegacy.parse(l.line);
AltosLine l = telemQueue.take();
if (l.line == null)
throw new IOException("IO error");
AltosTelemetry telem = AltosTelemetryLegacy.parse(l.line);
- if (state == null)
- state = new AltosState();
- else
- state = state.clone();
- telem.update_state(state);
- return state;
+ return telem;
}
public void close() {
}
public void close() {
- state = null;
link.remove_monitor(telemQueue);
link = null;
telemQueue.clear();
link.remove_monitor(telemQueue);
link = null;
telemQueue.clear();
@@
-63,15
+55,15
@@
public class TelemetryReader extends Thread {
}
public void run() {
}
public void run() {
- AltosState state = null;
-
try {
try {
- for (;;) {
+ AltosDebug.debug("starting loop");
+ while (telemQueue != null) {
try {
try {
- state = read();
- handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();
+ AltosTelemetry telem = read();
+ telem.set_frequency(link.frequency);
+ handler.obtainMessage(TelemetryService.MSG_TELEMETRY, telem).sendToTarget();
} catch (ParseException pp) {
} 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
+71,22
@@
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();
}
}
public TelemetryReader (AltosLink in_link, Handler in_handler) {
} finally {
close();
}
}
public TelemetryReader (AltosLink in_link, Handler in_handler) {
+ AltosDebug.debug("connected TelemetryReader create started");
link = in_link;
handler = in_handler;
link = in_link;
handler = in_handler;
- state = null;
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");
}
}
}
}