X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2FTeleGPSStatus.java;h=765a8ce4f6e0e62985dd2f26110b9435116dc3f5;hb=df276262900551a5eecd94903eefe9a264b161ec;hp=e6bb1ea58a7bb047836aa99857f41fca895aa738;hpb=8044eb8e23366e91c741060939baff5137f841c7;p=fw%2Faltos

diff --git a/telegps/TeleGPSStatus.java b/telegps/TeleGPSStatus.java
index e6bb1ea5..765a8ce4 100644
--- a/telegps/TeleGPSStatus.java
+++ b/telegps/TeleGPSStatus.java
@@ -19,8 +19,8 @@ package org.altusmetrum.telegps;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -83,6 +83,12 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 			else
 				setVisible(true);
 		}
+
+		public void reset() {
+			super.reset();
+			call = "";
+		}
+
 		public Call (GridBagLayout layout, int x) {
 			super (layout, x, "Callsign");
 		}
@@ -101,6 +107,12 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 				serial = state.serial;
 			}
 		}
+
+		public void reset() {
+			super.reset();
+			serial = -1;
+		}
+
 		public Serial (GridBagLayout layout, int x) {
 			super (layout, x, "Serial");
 		}
@@ -108,6 +120,32 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
 	Serial serial;
 
+	class Flight extends Value {
+
+		int	last_flight = -1;
+
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (state.flight != last_flight) {
+				if (state.flight == AltosLib.MISSING)
+					value.setText("none");
+				else
+					value.setText(String.format("%d", state.flight));
+				last_flight = state.flight;
+			}
+		}
+
+		public void reset() {
+			super.reset();
+			last_flight = -1;
+		}
+
+		public Flight (GridBagLayout layout, int x) {
+			super (layout, x, "Flight");
+		}
+	}
+
+	Flight flight;
+
 	class RSSI extends Value {
 		int	rssi = 10000;
 
@@ -123,6 +161,12 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 				rssi = new_rssi;
 			}
 		}
+
+		public void reset() {
+			super.reset();
+			rssi = 10000;
+		}
+
 		public RSSI (GridBagLayout layout, int x) {
 			super (layout, x, "RSSI");
 		}
@@ -135,13 +179,27 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 		long	last_secs = -1;
 
 		void show(AltosState state, AltosListenerState listener_state) {
-			long secs = (System.currentTimeMillis() - state.received_time + 500) / 1000;
-
-			if (secs != last_secs) {
-				value.setText(String.format("%d", secs));
-				last_secs = secs;
+			if (listener_state.running) {
+				long secs = (System.currentTimeMillis() - state.received_time + 500) / 1000;
+
+				if (secs != last_secs) {
+					value.setText(String.format("%d", secs));
+					last_secs = secs;
+				}
+			} else {
+				value.setText("done");
 			}
 		}
+
+		void reset() {
+			super.reset();
+			last_secs = -1;
+		}
+
+		void disable() {
+			value.setText("");
+		}
+
 		public LastPacket(GridBagLayout layout, int x) {
 			super (layout, x, "Age");
 		}
@@ -149,9 +207,14 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
 	LastPacket last_packet;
 
+	public void disable_receive() {
+		last_packet.disable();
+	}
+
 	public void reset () {
 		call.reset();
 		serial.reset();
+		flight.reset();
 		rssi.reset();
 		last_packet.reset();
 	}
@@ -159,6 +222,7 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 	public void font_size_changed(int font_size) {
 		call.set_font();
 		serial.set_font();
+		flight.set_font();
 		rssi.set_font();
 		last_packet.set_font();
 	}
@@ -169,8 +233,11 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 	public void show (AltosState state, AltosListenerState listener_state) {
 		call.show(state, listener_state);
 		serial.show(state, listener_state);
+		flight.show(state, listener_state);
 		rssi.show(state, listener_state);
 		last_packet.show(state, listener_state);
+		if (!listener_state.running)
+			stop();
 	}
 
 	public int height() {
@@ -178,6 +245,22 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 		return d.height;
 	}
 
+	TeleGPSStatusUpdate	status_update;
+	javax.swing.Timer	timer;
+
+	public void start(TeleGPSStatusUpdate status_update) {
+		this.status_update = status_update;
+		timer = new javax.swing.Timer(100, status_update);
+		timer.start();
+	}
+
+	public void stop() {
+		if (timer != null) {
+			timer.stop();
+			timer = null;
+		}
+	}
+
 	public TeleGPSStatus() {
 		layout = new GridBagLayout();
 
@@ -185,6 +268,7 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
 		call = new Call(layout, 0);
 		serial = new Serial(layout, 1);
+		flight = new Flight(layout, 2);
 		rssi = new RSSI(layout, 4);
 		last_packet = new LastPacket(layout, 5);
 	}