X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2FTeleGPSState.java;h=2117339486751156f07072c393cf60b5c2a95720;hb=6e4c104c28952f2010c7b1cbc9ce59e148ab2d8f;hp=9ba0b7a59cabf42b7cee93b371750a530d0fd2e1;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos

diff --git a/telegps/TeleGPSState.java b/telegps/TeleGPSState.java
index 9ba0b7a5..21173394 100644
--- a/telegps/TeleGPSState.java
+++ b/telegps/TeleGPSState.java
@@ -22,8 +22,8 @@ import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altosuilib_12.*;
 
 public class TeleGPSState extends AltosUIFlightTab {
 
@@ -124,10 +124,11 @@ public class TeleGPSState extends AltosUIFlightTab {
 
 	class FirmwareVersion extends AltosUIIndicator {
 		public void show(AltosState state, AltosListenerState listener_state) {
-			if (state.firmware_version == null)
+			AltosCalData cal_data = state.cal_data();
+			if (cal_data.firmware_version == null)
 				show("Missing");
 			else
-				show(state.firmware_version);
+				show(cal_data.firmware_version);
 		}
 
 		public FirmwareVersion(Container container, int y) {
@@ -137,9 +138,8 @@ public class TeleGPSState extends AltosUIFlightTab {
 
 	class FlightLogMax extends AltosUIIndicator {
 		public void show(AltosState state, AltosListenerState listener_state) {
-			int storage = state.flight_log_max;
-			if (storage == AltosLib.MISSING)
-				storage = state.log_space >> 10;
+			AltosCalData cal_data = state.cal_data();
+			int storage = cal_data.flight_log_max;
 			if (storage == AltosLib.MISSING)
 				show("Missing");
 			else