X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosIdleMonitorUI.java;h=d877be4d7d23f2ba789cd2bd91074f17bfcf75ec;hb=3f0379db7067eaf104892a82b9c49142087adece;hp=142f02784259d40b65ed349521006152ce66e382;hpb=3a84e8e0cc86481c301f4335843a0e1a94bad5c0;p=fw%2Faltos

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 142f0278..d877be4d 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -90,7 +90,9 @@ class AltosADC {
 }
 
 class AltosGPSQuery extends AltosGPS {
-	public AltosGPSQuery (AltosSerial serial) throws TimeoutException, InterruptedException {
+	public AltosGPSQuery (AltosSerial serial, AltosConfigData config_data)
+		throws TimeoutException, InterruptedException {
+		boolean says_done = config_data.compare_version("1.0") >= 0;
 		serial.printf("g\n");
 		for (;;) {
 			String line = serial.get_reply_no_dialog(5000);
@@ -140,6 +142,8 @@ class AltosGPSQuery extends AltosGPS {
 				int status = Integer.decode(bits[1]);
 				connected = (status & Altos.AO_GPS_RUNNING) != 0;
 				locked = (status & Altos.AO_GPS_VALID) != 0;
+				if (!says_done)
+					break;
 				continue;
 			}
 			if (line.startsWith("Sats:")) {
@@ -184,7 +188,7 @@ class AltosIdleMonitor extends Thread {
 				serial.flush_input();
 			config_data = new AltosConfigData(serial);
 			adc = new AltosADC(serial);
-			gps = new AltosGPSQuery(serial);
+			gps = new AltosGPSQuery(serial, config_data);
 		} finally {
 			if (remote)
 				serial.stop_remote();
@@ -237,6 +241,8 @@ class AltosIdleMonitor extends Thread {
 					update_state();
 					post_state();
 				} catch (TimeoutException te) {
+					if (AltosSerial.debug)
+						System.out.printf ("monitor idle data timeout\n");
 				}
 				Thread.sleep(1000);
 			}
@@ -255,7 +261,7 @@ class AltosIdleMonitor extends Thread {
 	}
 }
 
-public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
+public class AltosIdleMonitorUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
 	AltosDevice		device;
 	JTabbedPane		pane;
 	AltosPad		pad;
@@ -284,7 +290,19 @@ public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
 		flightInfo.clear();
 	}
 
+	public void set_font() {
+		pad.set_font();
+		flightInfo.set_font();
+	}
+
+	public void font_size_changed(int font_size) {
+		set_font();
+	}
+
+	AltosFlightStatusUpdate	status_update;
+
 	public void show(AltosState state, int crc_errors) {
+		status_update.saved_state = state;
 		try {
 			pad.show(state, crc_errors);
 			flightStatus.show(state, crc_errors);
@@ -372,12 +390,16 @@ public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
 		bag.add(pane, c);
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+
+		AltosPreferences.register_font_listener(this);
+
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
 					disconnect();
 					setVisible(false);
 					dispose();
+					AltosPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
 				}
 			});
 
@@ -386,6 +408,10 @@ public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
 
 		thread = new AltosIdleMonitor(this, device, remote);
 
+		status_update = new AltosFlightStatusUpdate(flightStatus);
+
+		new javax.swing.Timer(100, status_update).start();
+
 		thread.start();
 	}
 }