projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib/altosui: Get legacy telem working with new AltosState structure
[fw/altos]
/
altoslib
/
AltosFile.java
diff --git
a/altoslib/AltosFile.java
b/altoslib/AltosFile.java
index 90dbc6dbea8ecf069dbedbf530b88e33ee865ea3..54c5482435b18e75d3e173498b664240c82007ed 100644
(file)
--- a/
altoslib/AltosFile.java
+++ b/
altoslib/AltosFile.java
@@
-22,10
+22,17
@@
import java.util.*;
public class AltosFile extends File {
public class AltosFile extends File {
+ static String number(int n) {
+ if (n == AltosRecord.MISSING)
+ return "unk";
+ else
+ return String.format("%03d", n);
+ }
+
public AltosFile(int year, int month, int day, int serial, int flight, String extension) {
super (AltosPreferences.logdir(),
public AltosFile(int year, int month, int day, int serial, int flight, String extension) {
super (AltosPreferences.logdir(),
- String.format("%04d-%02d-%02d-serial-%
03d-flight-%03d
.%s",
- year, month, day,
serial, flight
, extension));
+ String.format("%04d-%02d-%02d-serial-%
s-flight-%s
.%s",
+ year, month, day,
number(serial), number(flight)
, extension));
}
public AltosFile(int serial, int flight, String extension) {
}
public AltosFile(int serial, int flight, String extension) {
@@
-37,7
+44,7
@@
public class AltosFile extends File {
extension);
}
extension);
}
- public AltosFile(Altos
Record telem
) {
- this(
telem.serial, telem
.flight, "telem");
+ public AltosFile(Altos
State state
) {
+ this(
state.serial, state
.flight, "telem");
}
}
}
}