projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Raise ParseException on invalid eeprom format
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index 6d5ce18512954c66a3aceee7c4c994760786e773..9dad8718507dd384c07a59c5506fb4d8234b2cc4 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-22,7
+22,7
@@
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
2
.*;
import org.altusmetrum.altosuilib_1.*;
public class AltosUI extends AltosUIFrame {
import org.altusmetrum.altosuilib_1.*;
public class AltosUI extends AltosUIFrame {
@@
-350,10
+350,10
@@
public class AltosUI extends AltosUIFrame {
FileInputStream in;
in = new FileInputStream(file);
FileInputStream in;
in = new FileInputStream(file);
- if (file.getName().endsWith("
eepro
m"))
- return new Altos
Eeprom
File(in);
+ if (file.getName().endsWith("
tele
m"))
+ return new Altos
Telemetry
File(in);
else
else
- return n
ull; // new AltosTelemetryIterab
le(in);
+ return n
ew AltosEepromFi
le(in);
} catch (FileNotFoundException fe) {
System.out.printf("%s\n", fe.getMessage());
return null;
} catch (FileNotFoundException fe) {
System.out.printf("%s\n", fe.getMessage());
return null;
@@
-434,11
+434,10
@@
public class AltosUI extends AltosUIFrame {
System.out.printf("Failed to open file '%s'\n", file);
return null;
}
System.out.printf("Failed to open file '%s'\n", file);
return null;
}
- if (file.getName().endsWith("eeprom")) {
+ if (file.getName().endsWith("telem"))
+ return new AltosTelemetryFile(in);
+ else
return new AltosEepromFile(in);
return new AltosEepromFile(in);
- } else {
- return null; // new AltosTelemetryIterable(in);
- }
}
static AltosReplayReader replay_file(File file) {
}
static AltosReplayReader replay_file(File file) {
@@
-493,7
+492,7
@@
public class AltosUI extends AltosUIFrame {
stats.max_speed,
AltosConvert.meters_to_feet(stats.max_speed),
AltosConvert.meters_to_mach(stats.max_speed));
stats.max_speed,
AltosConvert.meters_to_feet(stats.max_speed),
AltosConvert.meters_to_mach(stats.max_speed));
- if (stats.max_acceleration != Altos
Record
.MISSING) {
+ if (stats.max_acceleration != Altos
Lib
.MISSING) {
System.out.printf("Max accel: %6.0f m/s² %6.0f ft/s² %6.2f g\n",
stats.max_acceleration,
AltosConvert.meters_to_feet(stats.max_acceleration),
System.out.printf("Max accel: %6.0f m/s² %6.0f ft/s² %6.2f g\n",
stats.max_acceleration,
AltosConvert.meters_to_feet(stats.max_acceleration),
@@
-517,10
+516,12
@@
public class AltosUI extends AltosUIFrame {
static boolean process_cat(File file) {
try {
static boolean process_cat(File file) {
try {
- FileInputStream input = new FileInputStream(file);
- AltosEepromFile eef = new AltosEepromFile(input);
+ AltosStateIterable eef = record_iterable(file);
+ System.out.printf ("process cat\n");
for (AltosState state : eef) {
for (AltosState state : eef) {
+ System.out.printf ("tick %d state %d height %g\n",
+ state.tick, state.state, state.height());
if ((state.set & AltosState.set_gps) != 0)
System.out.printf ("time %g lat %g lon %g alt %g\n",
state.time_since_boost(),
if ((state.set & AltosState.set_gps) != 0)
System.out.printf ("time %g lat %g lon %g alt %g\n",
state.time_since_boost(),