projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AltosSiteMap: extend map if rocket goes far away
[fw/altos]
/
ao-tools
/
altosui
/
AltosCSV.java
diff --git
a/ao-tools/altosui/AltosCSV.java
b/ao-tools/altosui/AltosCSV.java
index 3a9e48f85eed31ba392b720e51ce4d86267b76f7..df98b2b45f8f381bf22bf55e932dbf51c52dfafa 100644
(file)
--- a/
ao-tools/altosui/AltosCSV.java
+++ b/
ao-tools/altosui/AltosCSV.java
@@
-22,9
+22,7
@@
import java.io.*;
import java.text.*;
import java.util.*;
import java.text.*;
import java.util.*;
-import altosui.AltosRecord;
-
-public class AltosCSV {
+public class AltosCSV implements AltosWriter {
File name;
PrintStream out;
boolean header_written;
File name;
PrintStream out;
boolean header_written;
@@
-33,9
+31,9
@@
public class AltosCSV {
LinkedList<AltosRecord> pad_records;
AltosState state;
LinkedList<AltosRecord> pad_records;
AltosState state;
- static final int ALTOS_CSV_VERSION =
1
;
+ static final int ALTOS_CSV_VERSION =
2
;
- /* Version
1
format:
+ /* Version
2
format:
*
* General info
* version number
*
* General info
* version number
@@
-91,7
+89,7
@@
public class AltosCSV {
void write_general(AltosRecord record) {
out.printf("%s, %d, %d, %s, %8.2f, %4d, %3d",
void write_general(AltosRecord record) {
out.printf("%s, %d, %d, %s, %8.2f, %4d, %3d",
-
record.version
, record.serial, record.flight, record.callsign,
+
ALTOS_CSV_VERSION
, record.serial, record.flight, record.callsign,
(double) record.time,
record.rssi,
record.status & 0x7f);
(double) record.time,
record.rssi,
record.status & 0x7f);