X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=31d5a54d12e539cfc071151d6e8f7ded03d5ba68;hb=b984ff81d6b8979574e0248ffe8876634b8e1942;hp=6d5ce18512954c66a3aceee7c4c994760786e773;hpb=de8d9c5630ae46378c50faf97f7d2e97fe139e30;p=fw%2Faltos diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index 6d5ce185..31d5a54d 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -350,10 +350,10 @@ public class AltosUI extends AltosUIFrame { FileInputStream in; in = new FileInputStream(file); - if (file.getName().endsWith("eeprom")) - return new AltosEepromFile(in); + if (file.getName().endsWith("telem")) + return new AltosTelemetryFile(in); else - return null; // new AltosTelemetryIterable(in); + return new AltosEepromFile(in); } 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; } - if (file.getName().endsWith("eeprom")) { + if (file.getName().endsWith("telem")) + return new AltosTelemetryFile(in); + else return new AltosEepromFile(in); - } else { - return null; // new AltosTelemetryIterable(in); - } } static AltosReplayReader replay_file(File file) { @@ -517,10 +516,12 @@ public class AltosUI extends AltosUIFrame { 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) { + 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(),