X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosUI.java;h=ad7964e939a77c4f3ec1914c598395f0e35e4915;hp=b47df0d9cc4844e45d94c40e94775cc24bc85fe8;hb=9a4c2c7fc6af922d052e23a1b99bf847fbf9b0e9;hpb=017ed54ff69ef2f7740ea2578e22bf72e88deafb

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index b47df0d9..ad7964e9 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosUI extends AltosUIFrame {
 	public AltosVoice voice = new AltosVoice();
@@ -74,6 +74,10 @@ public class AltosUI extends AltosUIFrame {
 		}
 	}
 
+	public void scan_device_selected(AltosDevice device) {
+		telemetry_window(device);
+	}
+
 	Container	pane;
 	GridBagLayout	gridbag;
 
@@ -233,7 +237,7 @@ public class AltosUI extends AltosUIFrame {
 		});
 
 		setLocationByPlatform(false);
-		
+
 		/* Insets aren't set before the window is visible */
 		setVisible(true);
 	}
@@ -272,7 +276,7 @@ public class AltosUI extends AltosUIFrame {
 	}
 
 	void ScanChannels() {
-		new AltosScanUI(AltosUI.this);
+		new AltosScanUI(AltosUI.this, true);
 	}
 
 	void LoadMaps() {
@@ -350,10 +354,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 +438,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) {
@@ -469,7 +472,7 @@ public class AltosUI extends AltosUIFrame {
 		}
 		return false;
 	}
-	
+
 	static boolean process_summary(File file) {
 		AltosStateIterable states = record_iterable(file);
 		if (states == null)
@@ -493,7 +496,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 +524,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(),
@@ -546,7 +551,7 @@ public class AltosUI extends AltosUIFrame {
 		System.out.printf("    --kml\tgenerate KML output for use with Google Earth\n");
 		System.exit(code);
 	}
-	
+
 	public static void main(final String[] args) {
 		int	errors = 0;
 		load_library(null);
@@ -559,8 +564,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 +578,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"))