X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosPad.java;h=4f55636db23c706f2ec7a4fafd3894811b6e30ab;hp=2f87b6818db55e5c86a7efd8ebb65508bd5d2dde;hb=c57d86f6c9b56e90c986f460f93663a3e16cdf7a;hpb=d6445b3739ac2c5dd040efdb97317a6b2a48044a diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java index 2f87b681..4f55636d 100644 --- a/altosui/AltosPad.java +++ b/altosui/AltosPad.java @@ -18,8 +18,8 @@ package altosui; import java.util.*; -import org.altusmetrum.altoslib_8.*; -import org.altusmetrum.altosuilib_8.*; +import org.altusmetrum.altoslib_10.*; +import org.altusmetrum.altosuilib_10.*; public class AltosPad extends AltosUIFlightTab { @@ -49,10 +49,10 @@ public class AltosPad extends AltosUIFlightTab { hide(); } else { if (state.flight != 0) { - if (state.state <= Altos.ao_flight_pad) + if (state.state() <= Altos.ao_flight_pad) show("Ready to record"); - else if (state.state < Altos.ao_flight_landed || - state.state == AltosLib.ao_flight_stateless) + else if (state.state() < Altos.ao_flight_landed || + state.state() == AltosLib.ao_flight_stateless) show("Recording data"); else show("Recorded data"); @@ -121,8 +121,8 @@ public class AltosPad extends AltosUIFlightTab { } boolean report_pad(AltosState state) { - if ((state.state == AltosLib.ao_flight_stateless || - state.state < AltosLib.ao_flight_pad) && + if ((state.state() == AltosLib.ao_flight_stateless || + state.state() < AltosLib.ao_flight_pad) && state.gps != null && state.gps.lat != AltosLib.MISSING) {