X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2FTeleGPSStatus.java;h=a6ddd1b0935759b542ac5fc3b88329aac65f2151;hp=765a8ce4f6e0e62985dd2f26110b9435116dc3f5;hb=15e3f2dae15e41a8501e3e1d221536751af15f94;hpb=97adfff4cfb67c17a96f3ff46606b4e439422b01

diff --git a/telegps/TeleGPSStatus.java b/telegps/TeleGPSStatus.java
index 765a8ce4..a6ddd1b0 100644
--- a/telegps/TeleGPSStatus.java
+++ b/telegps/TeleGPSStatus.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -74,11 +75,13 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 		String	call;
 
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.callsign != call) {
-				value.setText(state.callsign);
-				call = state.callsign;
+			if (state.cal_data == null)
+				System.out.printf("null cal data?\n");
+			if (state.cal_data.callsign != call) {
+				value.setText(state.cal_data.callsign);
+				call = state.cal_data.callsign;
 			}
-			if (state.callsign == null)
+			if (state.cal_data.callsign == null)
 				setVisible(false);
 			else
 				setVisible(true);
@@ -99,12 +102,12 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 	class Serial extends Value {
 		int	serial = -1;
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.serial != serial) {
-				if (state.serial == AltosLib.MISSING)
+			if (state.cal_data.serial != serial) {
+				if (state.cal_data.serial == AltosLib.MISSING)
 					value.setText("none");
 				else
-					value.setText(String.format("%d", state.serial));
-				serial = state.serial;
+					value.setText(String.format("%d", state.cal_data.serial));
+				serial = state.cal_data.serial;
 			}
 		}
 
@@ -125,12 +128,12 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 		int	last_flight = -1;
 
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.flight != last_flight) {
-				if (state.flight == AltosLib.MISSING)
+			if (state.cal_data.flight != last_flight) {
+				if (state.cal_data.flight == AltosLib.MISSING)
 					value.setText("none");
 				else
-					value.setText(String.format("%d", state.flight));
-				last_flight = state.flight;
+					value.setText(String.format("%d", state.cal_data.flight));
+				last_flight = state.cal_data.flight;
 			}
 		}