projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Use shared AltosFontListener class
[fw/altos]
/
altoslib
/
AltosLog.java
diff --git
a/altoslib/AltosLog.java
b/altoslib/AltosLog.java
index 08c45ca80d9563a70774d2e26e61145570ec1003..aa30190cf148eecc987b877e5b73e560a845be6f 100644
(file)
--- a/
altoslib/AltosLog.java
+++ b/
altoslib/AltosLog.java
@@
-18,8
+18,6
@@
package org.altusmetrum.AltosLib;
import java.io.*;
package org.altusmetrum.AltosLib;
import java.io.*;
-import java.lang.*;
-import java.util.*;
import java.text.ParseException;
import java.util.concurrent.LinkedBlockingQueue;
import java.text.ParseException;
import java.util.concurrent.LinkedBlockingQueue;
@@
-27,7
+25,7
@@
import java.util.concurrent.LinkedBlockingQueue;
* This creates a thread to capture telemetry data and write it to
* a log file
*/
* This creates a thread to capture telemetry data and write it to
* a log file
*/
-class AltosLog implements Runnable {
+
public
class AltosLog implements Runnable {
LinkedBlockingQueue<AltosLine> input_queue;
LinkedBlockingQueue<String> pending_queue;
LinkedBlockingQueue<AltosLine> input_queue;
LinkedBlockingQueue<String> pending_queue;
@@
-47,7
+45,7
@@
class AltosLog implements Runnable {
}
}
}
}
- void close() {
+
public
void close() {
close_log_file();
if (log_thread != null) {
log_thread.interrupt();
close_log_file();
if (log_thread != null) {
log_thread.interrupt();
@@
-55,14
+53,13
@@
class AltosLog implements Runnable {
}
}
}
}
- File file() {
+
public
File file() {
return file;
}
boolean open (AltosRecord telem) throws IOException {
AltosFile a = new AltosFile(telem);
return file;
}
boolean open (AltosRecord telem) throws IOException {
AltosFile a = new AltosFile(telem);
- System.out.printf("open %s\n", a.toString());
log_file = new FileWriter(a, true);
if (log_file != null) {
while (!pending_queue.isEmpty()) {
log_file = new FileWriter(a, true);
if (log_file != null) {
while (!pending_queue.isEmpty()) {
@@
-88,7
+85,7
@@
class AltosLog implements Runnable {
continue;
try {
AltosRecord telem = AltosTelemetry.parse(line.line, previous);
continue;
try {
AltosRecord telem = AltosTelemetry.parse(line.line, previous);
- if (
telem.serial != 0 && telem.flight
!= 0 &&
+ if (
(telem.seen & AltosRecord.seen_flight)
!= 0 &&
(telem.serial != serial || telem.flight != flight || log_file == null))
{
close_log_file();
(telem.serial != serial || telem.flight != flight || log_file == null))
{
close_log_file();