altos/test: Adjust CRC error rate after FEC fix

[fw/altos] / altosui / AltosPad.java

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 331b58e366fde122a8e76adccb77527f8f889cc0..e9bb4e41c2802f1003f50ab0c6570c0ce64d2fe3 100644 (file)
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -19,8 +19,8 @@
 package altosui;
 
 import java.util.*;
-import org.altusmetrum.altoslib_12.*;
-import org.altusmetrum.altosuilib_12.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class AltosPad extends AltosUIFlightTab {
 
@@ -46,10 +46,11 @@ public class AltosPad extends AltosUIFlightTab {
 
        class LoggingReady extends AltosUIIndicator {
                public void show (AltosState state, AltosListenerState listener_state) {
-                       if (state == null || state.cal_data.flight == AltosLib.MISSING) {
+                       AltosCalData    cal_data = state.cal_data();
+                       if (state == null || cal_data.flight == AltosLib.MISSING) {
                                hide();
                        } else {
-                               if (state.cal_data.flight != 0) {
+                               if (cal_data.flight != 0) {
                                        if (state.state() <= Altos.ao_flight_pad)
                                                show("Ready to record");
                                        else if (state.state() < Altos.ao_flight_landed ||
@@ -59,7 +60,7 @@ public class AltosPad extends AltosUIFlightTab {
                                                show("Recorded data");
                                } else
                                        show("Storage full");
-                               set_lights(state.cal_data.flight != 0);
+                               set_lights(cal_data.flight != 0);
                        }
                }
                public LoggingReady (AltosUIFlightTab container, int y) {
@@ -213,9 +214,13 @@ public class AltosPad extends AltosUIFlightTab {
        class PadAlt extends AltosUIUnitsIndicator {
 
                public double value(AltosState state, int i) {
-                       if (report_pad(state))
-                               return state.pad_alt;
-                       else if (state.gps != null)
+                       if (report_pad(state)) {
+                               double alt = state.gps_ground_altitude();
+                               if (alt == AltosLib.MISSING)
+                                       alt = state.ground_altitude();
+                               return alt;
+                       }
+                       else if (state.gps != null && state.gps.alt != AltosLib.MISSING)
                                return state.gps.alt;
                        else
                                return state.altitude();