X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=91278afe2ab7b2de388c8f676a6d00b752a70d6c;hp=599c5aecb9f1b3975cd90b94cd36547207577f1f;hb=4ad062969ae8a608b8428620579bbe114e580a11;hpb=3f9b66b307ee88172151e3bee58e50f5acbde109

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 599c5aec..91278afe 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -301,19 +301,24 @@ public class AltosUI extends JFrame {
 				info_add_row(1, "GPS", " unlocked");
 			else
 				info_add_row(1, "GPS", "  missing");
-			info_add_row(1, "Satellites", "%6d", state.gps.nsat);
+			info_add_row(1, "Satellites", "%6d", state.data.gps.nsat);
 			info_add_deg(1, "Latitude", state.gps.lat, 'N', 'S');
 			info_add_deg(1, "Longitude", state.gps.lon, 'E', 'W');
 			info_add_row(1, "GPS altitude", "%6d", state.gps.alt);
 			info_add_row(1, "GPS height", "%6.0f", state.gps_height);
-			info_add_row(1, "GPS ground speed", "%8.1f m/s %3d°",
-				       state.gps.ground_speed,
-				       state.gps.course);
-			info_add_row(1, "GPS climb rate", "%8.1f m/s",
-				     state.gps.climb_rate);
+
+			/* The SkyTraq GPS doesn't report these values */
+			if (false) {
+				info_add_row(1, "GPS ground speed", "%8.1f m/s %3d°",
+					     state.gps.ground_speed,
+					     state.gps.course);
+				info_add_row(1, "GPS climb rate", "%8.1f m/s",
+					     state.gps.climb_rate);
+				info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
+					     state.gps.h_error, state.gps.v_error);
+			}
 			info_add_row(1, "GPS hdop", "%8.1f", state.gps.hdop);
-			info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
-				     state.gps.h_error, state.gps.v_error);
+
 			if (state.npad > 0) {
 				if (state.from_pad != null) {
 					info_add_row(1, "Distance from pad", "%6.0f m", state.from_pad.distance);
@@ -324,7 +329,7 @@ public class AltosUI extends JFrame {
 				}
 				info_add_deg(1, "Pad latitude", state.pad_lat, 'N', 'S');
 				info_add_deg(1, "Pad longitude", state.pad_lon, 'E', 'W');
-				info_add_row(1, "Pad GPS alt", "%9.2fm", state.pad_alt);
+				info_add_row(1, "Pad GPS alt", "%6.0f m", state.pad_alt);
 			}
 			info_add_row(1, "GPS date", "%04d-%02d-%02d",
 				       state.gps.gps_time.year,