X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2FTeleGPSState.java;h=19fd369454ff9b4403486c5976485966b7ddc393;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hp=7c410e9815a8bc45b0ba7bc439687a711a87e9b9;hpb=643c2fb03833d658320f476ef731bbb06fe3cc31;p=fw%2Faltos

diff --git a/telegps/TeleGPSState.java b/telegps/TeleGPSState.java
index 7c410e98..19fd3694 100644
--- a/telegps/TeleGPSState.java
+++ b/telegps/TeleGPSState.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
@@ -21,8 +22,8 @@ import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altosuilib_12.*;
 
 public class TeleGPSState extends AltosUIFlightTab {
 
@@ -123,10 +124,10 @@ public class TeleGPSState extends AltosUIFlightTab {
 
 	class FirmwareVersion extends AltosUIIndicator {
 		public void show(AltosState state, AltosListenerState listener_state) {
-			if (state.firmware_version == null)
+			if (state.cal_data.firmware_version == null)
 				show("Missing");
 			else
-				show(state.firmware_version);
+				show(state.cal_data.firmware_version);
 		}
 
 		public FirmwareVersion(Container container, int y) {
@@ -136,10 +137,11 @@ public class TeleGPSState extends AltosUIFlightTab {
 
 	class FlightLogMax extends AltosUIIndicator {
 		public void show(AltosState state, AltosListenerState listener_state) {
-			if (state.flight_log_max == AltosLib.MISSING)
+			int storage = state.cal_data.flight_log_max;
+			if (storage == AltosLib.MISSING)
 				show("Missing");
 			else
-				show(String.format("%dkB", state.flight_log_max));
+				show(String.format("%dkB", storage));
 		}
 
 		public FlightLogMax(Container container, int y) {