diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:09:09 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:09:09 -0700 |
| commit | 4ecc53175a5c28cbc1b846c24d83b6adc3afc2ef (patch) | |
| tree | 4c318f3d5b7ef01247531a8ccb8ce3ce211e48b3 /altosui/AltosPad.java | |
| parent | 19d25c9f4c80d2c8562fc4abd766a23961167e79 (diff) | |
| parent | a2ea621eac3263348aff50885c79296f8ece26ed (diff) | |
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'altosui/AltosPad.java')
| -rw-r--r-- | altosui/AltosPad.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java index 2f87b681..f984e908 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_9.*; +import org.altusmetrum.altosuilib_9.*; 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) { |