diff options
| author | Keith Packard <keithp@keithp.com> | 2013-08-29 19:24:51 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-08-29 19:24:51 -0500 |
| commit | de8d9c5630ae46378c50faf97f7d2e97fe139e30 (patch) | |
| tree | e8e41e4186c5d27e1a5184d915bdb9f08926fa7a /altoslib/AltosTelemetryReader.java | |
| parent | ce1378385ef273010498e81c205f42d8e32c7dc1 (diff) | |
altoslib, altosui: Restructured state management now does TM eeprom files
Removed uses of AltosRecord from AltosState, now just need to rewrite
the other AltosState changing code to match
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosTelemetryReader.java')
| -rw-r--r-- | altoslib/AltosTelemetryReader.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java index b4293c73..3915927c 100644 --- a/altoslib/AltosTelemetryReader.java +++ b/altoslib/AltosTelemetryReader.java @@ -27,16 +27,18 @@ public class AltosTelemetryReader extends AltosFlightReader { AltosRecord previous; double frequency; int telemetry; + AltosState state = null; LinkedBlockingQueue<AltosLine> telem; - public AltosRecord read() throws InterruptedException, ParseException, AltosCRCException, IOException { + public AltosState 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; - return next; + state = new AltosState (next, state); + return state; } public void flush() { |