X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2FTeleGPSStatus.java;h=cc9966b859f7f2efac601eea1817543f267c204d;hb=56146cd379e1319b7adcf8e22cdda55f771e11be;hp=14706877e9f71622bdea4fb9b5ecbff89dc29543;hpb=a21dbb05fad2625d17bc2302faa96dc295e6ed7c;p=fw%2Faltos

diff --git a/telegps/TeleGPSStatus.java b/telegps/TeleGPSStatus.java
index 14706877..cc9966b8 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_7.*;
+import org.altusmetrum.altosuilib_7.*;
 
 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");
 		}
@@ -121,6 +133,12 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 				last_flight = state.flight;
 			}
 		}
+
+		public void reset() {
+			super.reset();
+			last_flight = -1;
+		}
+
 		public Flight (GridBagLayout layout, int x) {
 			super (layout, x, "Flight");
 		}
@@ -143,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");
 		}
@@ -155,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");
 		}
@@ -169,6 +207,10 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
 	LastPacket last_packet;
 
+	public void disable_receive() {
+		last_packet.disable();
+	}
+
 	public void reset () {
 		call.reset();
 		serial.reset();
@@ -194,6 +236,8 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 		flight.show(state, listener_state);
 		rssi.show(state, listener_state);
 		last_packet.show(state, listener_state);
+		if (!listener_state.running)
+			stop();
 	}
 
 	public int height() {
@@ -201,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();