projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib, altosui: Restructured state management now does TM eeprom files
[fw/altos]
/
altoslib
/
AltosTelemetryReader.java
diff --git
a/altoslib/AltosTelemetryReader.java
b/altoslib/AltosTelemetryReader.java
index 7139644edda8e9af37d521c9620ece8277321cfc..3915927c5df0666714af79a3a90700eb15f02f69 100644
(file)
--- a/
altoslib/AltosTelemetryReader.java
+++ b/
altoslib/AltosTelemetryReader.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib;
+package org.altusmetrum.altoslib
_1
;
import java.text.*;
import java.io.*;
import java.text.*;
import java.io.*;
@@
-27,16
+27,18
@@
public class AltosTelemetryReader extends AltosFlightReader {
AltosRecord previous;
double frequency;
int telemetry;
AltosRecord previous;
double frequency;
int telemetry;
+ AltosState state = null;
LinkedBlockingQueue<AltosLine> telem;
LinkedBlockingQueue<AltosLine> telem;
- public Altos
Record
read() throws InterruptedException, ParseException, AltosCRCException, IOException {
+ public Altos
State
read() throws InterruptedException, ParseException, AltosCRCException, IOException {
AltosLine l = telem.take();
if (l.line == null)
throw new IOException("IO error");
AltosRecord next = AltosTelemetry.parse(l.line, previous);
previous = next;
AltosLine l = telem.take();
if (l.line == null)
throw new IOException("IO error");
AltosRecord next = AltosTelemetry.parse(l.line, previous);
previous = next;
- return next;
+ state = new AltosState (next, state);
+ return state;
}
public void flush() {
}
public void flush() {
@@
-107,6
+109,14
@@
public class AltosTelemetryReader extends AltosFlightReader {
return log.file();
}
return log.file();
}
+ public boolean has_monitor_battery() {
+ return link.has_monitor_battery();
+ }
+
+ public double monitor_battery() {
+ return link.monitor_battery();
+ }
+
public AltosTelemetryReader (AltosLink in_link)
throws IOException, InterruptedException, TimeoutException {
link = in_link;
public AltosTelemetryReader (AltosLink in_link)
throws IOException, InterruptedException, TimeoutException {
link = in_link;