Merge remote-tracking branch 'origin/master'

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index b47df0d9cc4844e45d94c40e94775cc24bc85fe8..5d4599476ba44bd988e0b57a1f792fe12fd5dd6f 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 org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_3.*;
 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);
-                       if (file.getName().endsWith("eeprom"))
-                               return new AltosEepromFile(in);
-                       else
+                       if (file.getName().endsWith("telem"))
                                return new AltosTelemetryFile(in);
+                       else
+                               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")) {
-                       return new AltosEepromFile(in);
-               } else {
+               if (file.getName().endsWith("telem"))
                        return new AltosTelemetryFile(in);
-               }
+               else
+                       return new AltosEepromFile(in);
        }
 
        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));
-                       if (stats.max_acceleration != AltosRecord.MISSING) {
+                       if (stats.max_acceleration != AltosLib.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),
@@ -521,6 +520,8 @@ public class AltosUI extends AltosUIFrame {
 
                        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(),
@@ -559,8 +560,9 @@ public class AltosUI extends AltosUIFrame {
                        AltosUI altosui = new AltosUI();
 
                        java.util.List<AltosDevice> devices = AltosUSBDevice.list(Altos.product_basestation);
-                       for (AltosDevice device : devices)
-                               altosui.telemetry_window(device);
+                       if (devices != null)
+                               for (AltosDevice device : devices)
+                                       altosui.telemetry_window(device);
                } else {
                        int process = process_none;
                        for (int i = 0; i < args.length; i++) {
@@ -572,7 +574,7 @@ public class AltosUI extends AltosUIFrame {
                                        } else {
                                                double lat = Double.parseDouble(args[i+1]);
                                                double lon = Double.parseDouble(args[i+2]);
-                                               AltosSiteMap.prefetchMaps(lat, lon, 5, 5);
+                                               AltosSiteMap.prefetchMaps(lat, lon);
                                                i += 2;
                                        }
                                } else if (args[i].equals("--replay"))