projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
telegps: Get telegps application working again
[fw/altos]
/
altoslib
/
AltosTelemetryReader.java
diff --git
a/altoslib/AltosTelemetryReader.java
b/altoslib/AltosTelemetryReader.java
index 9611361310a229b614cf8d9d6c734bc5e6e207d0..1020efb0f1f4ffc0d1cbeaccd45a904e58297483 100644
(file)
--- a/
altoslib/AltosTelemetryReader.java
+++ b/
altoslib/AltosTelemetryReader.java
@@
-23,13
+23,13
@@
import java.io.*;
import java.util.concurrent.*;
public class AltosTelemetryReader extends AltosFlightReader {
import java.util.concurrent.*;
public class AltosTelemetryReader extends AltosFlightReader {
- AltosLink link;
- AltosLog log;
- double frequency;
- int telemetry;
- int telemetry_rate;
- p
ublic AltosState
state = null;
- p
ublic AltosCalData
cal_data = null;
+ AltosLink
link;
+ AltosLog
log;
+ double
frequency;
+ int
telemetry;
+ int
telemetry_rate;
+ p
rivate AltosState
state = null;
+ p
rivate AltosCalData
cal_data = null;
LinkedBlockingQueue<AltosLine> telem;
LinkedBlockingQueue<AltosLine> telem;
@@
-41,14
+41,22
@@
public class AltosTelemetryReader extends AltosFlightReader {
throw new IOException("IO error");
} while (!link.get_monitor());
AltosTelemetry telem = AltosTelemetry.parse(l.line);
throw new IOException("IO error");
} while (!link.get_monitor());
AltosTelemetry telem = AltosTelemetry.parse(l.line);
- if (
cal_data == null)
-
cal_data = new AltosCalData(
);
- if (state == null)
- state = new AltosState(cal_data);
- telem.provide_data(state, cal_data);
+ if (
state == null) {
+
System.out.printf("Make state\n"
);
+ state = new AltosState(cal_data());
+ }
+ telem.provide_data(state,
state.
cal_data);
return state;
}
return state;
}
+ public AltosCalData cal_data() {
+ if (cal_data == null) {
+ System.out.printf("Make cal data\n");
+ cal_data = new AltosCalData();
+ }
+ return cal_data;
+ }
+
public void flush() {
telem.clear();
}
public void flush() {
telem.clear();
}