projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'branch-1.6' into debian
[fw/altos]
/
altosui
/
AltosPad.java
diff --git
a/altosui/AltosPad.java
b/altosui/AltosPad.java
index 2f87b6818db55e5c86a7efd8ebb65508bd5d2dde..f984e90897fb9e20cbd7ceb48ca8da43e2eb8f17 100644
(file)
--- a/
altosui/AltosPad.java
+++ b/
altosui/AltosPad.java
@@
-18,8
+18,8
@@
package altosui;
import java.util.*;
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 {
public class AltosPad extends AltosUIFlightTab {
@@
-49,10
+49,10
@@
public class AltosPad extends AltosUIFlightTab {
hide();
} else {
if (state.flight != 0) {
hide();
} else {
if (state.flight != 0) {
- if (state.state <= Altos.ao_flight_pad)
+ if (state.state
()
<= Altos.ao_flight_pad)
show("Ready to record");
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");
show("Recording data");
else
show("Recorded data");
@@
-121,8
+121,8
@@
public class AltosPad extends AltosUIFlightTab {
}
boolean report_pad(AltosState state) {
}
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)
{
state.gps != null &&
state.gps.lat != AltosLib.MISSING)
{