projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stmf0: Have fast ADC ring buffer code use wrap-around
[fw/altos]
/
altosui
/
AltosPad.java
diff --git
a/altosui/AltosPad.java
b/altosui/AltosPad.java
index 5c33fd16630fc03578c51e809345b93d7672e132..6214fa5a58965c82094d07789131c65f34ae5512 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_
5
.*;
-import org.altusmetrum.altosuilib_
3
.*;
+import org.altusmetrum.altoslib_
6
.*;
+import org.altusmetrum.altosuilib_
6
.*;
public class AltosPad extends AltosUIFlightTab {
public class AltosPad extends AltosUIFlightTab {
@@
-117,6
+117,17
@@
public class AltosPad extends AltosUIFlightTab {
}
}
}
}
+ boolean report_pad(AltosState state) {
+ if ((state.state == AltosLib.ao_flight_stateless ||
+ state.state < AltosLib.ao_flight_pad) &&
+ state.gps != null &&
+ state.gps.lat != AltosLib.MISSING)
+ {
+ return false;
+ }
+ return true;
+ }
+
class PadLat extends AltosUIIndicator {
double last_lat = AltosLib.MISSING - 1;
class PadLat extends AltosUIIndicator {
double last_lat = AltosLib.MISSING - 1;
@@
-126,12
+137,12
@@
public class AltosPad extends AltosUIFlightTab {
String label = null;
if (state != null) {
String label = null;
if (state != null) {
- if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.lat != AltosLib.MISSING) {
- lat = state.gps.lat;
- label = "Latitude";
- } else {
+ if (report_pad(state)) {
lat = state.pad_lat;
label = "Pad Latitude";
lat = state.pad_lat;
label = "Pad Latitude";
+ } else {
+ lat = state.gps.lat;
+ label = "Latitude";
}
}
if (lat != last_lat) {
}
}
if (lat != last_lat) {
@@
-163,12
+174,12
@@
public class AltosPad extends AltosUIFlightTab {
String label = null;
if (state != null) {
String label = null;
if (state != null) {
- if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.lon != AltosLib.MISSING) {
- lon = state.gps.lon;
- label = "Longitude";
- } else {
+ if (report_pad(state)) {
lon = state.pad_lon;
label = "Pad Longitude";
lon = state.pad_lon;
label = "Pad Longitude";
+ } else {
+ lon = state.gps.lon;
+ label = "Longitude";
}
}
if (lon != last_lon) {
}
}
if (lon != last_lon) {
@@
-200,12
+211,12
@@
public class AltosPad extends AltosUIFlightTab {
String label = null;
if (state != null) {
String label = null;
if (state != null) {
- if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.alt != AltosLib.MISSING) {
- alt = state.gps.alt;
- label = "Altitude";
- } else {
+ if (report_pad(state)) {
alt = state.pad_alt;
label = "Pad Altitude";
alt = state.pad_alt;
label = "Pad Altitude";
+ } else {
+ alt = state.gps.alt;
+ label = "Altitude";
}
}
if (alt != last_alt) {
}
}
if (alt != last_alt) {