projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up reflashing section, include section on self-flash recovery
[fw/altos]
/
altoslib
/
AltosTelemetryReader.java
diff --git
a/altoslib/AltosTelemetryReader.java
b/altoslib/AltosTelemetryReader.java
index 94fa560b77fce450af0a7a55b9ce573234175342..aea978445578e536b3daf3a5b1ffc73ffaf3675d 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_2
;
import java.text.*;
import java.io.*;
import java.text.*;
import java.io.*;
@@
-24,19
+24,23
@@
import java.util.concurrent.*;
public class AltosTelemetryReader extends AltosFlightReader {
AltosLink link;
AltosLog log;
public class AltosTelemetryReader extends AltosFlightReader {
AltosLink link;
AltosLog log;
- AltosRecord previous;
double frequency;
int telemetry;
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");
AltosLine l = telem.take();
if (l.line == null)
throw new IOException("IO error");
- AltosRecord next = AltosTelemetry.parse(l.line, previous);
- previous = next;
- return next;
+ AltosTelemetry telem = AltosTelemetry.parse(l.line);
+ if (state == null)
+ state = new AltosState();
+ else
+ state = state.clone();
+ telem.update_state(state);
+ return state;
}
public void flush() {
}
public void flush() {
@@
-44,7
+48,6
@@
public class AltosTelemetryReader extends AltosFlightReader {
}
public void reset() {
}
public void reset() {
- previous = null;
flush();
}
flush();
}
@@
-107,13
+110,20
@@
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;
try {
log = new AltosLog(link);
name = link.name;
public AltosTelemetryReader (AltosLink in_link)
throws IOException, InterruptedException, TimeoutException {
link = in_link;
try {
log = new AltosLog(link);
name = link.name;
- previous = null;
telem = new LinkedBlockingQueue<AltosLine>();
frequency = AltosPreferences.frequency(link.serial);
set_frequency(frequency);
telem = new LinkedBlockingQueue<AltosLine>();
frequency = AltosPreferences.frequency(link.serial);
set_frequency(frequency);