projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Add product pictures to manual
[fw/altos]
/
altosui
/
AltosPad.java
diff --git
a/altosui/AltosPad.java
b/altosui/AltosPad.java
index e9c973deebcad58faae26e4f4a7b735a9fa877d5..b35bd23a8626f14032344b671dcd91575a385c1a 100644
(file)
--- a/
altosui/AltosPad.java
+++ b/
altosui/AltosPad.java
@@
-19,7
+19,7
@@
package altosui;
import java.awt.*;
import javax.swing.*;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
2
.*;
public class AltosPad extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
public class AltosPad extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
@@
-176,7
+176,7
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class Battery extends LaunchStatus {
void show (AltosState state, AltosListenerState listener_state) {
class Battery extends LaunchStatus {
void show (AltosState state, AltosListenerState listener_state) {
- if (state == null || state.battery_voltage == Altos
Record
.MISSING)
+ if (state == null || state.battery_voltage == Altos
Lib
.MISSING)
hide();
else {
show("%4.2f V", state.battery_voltage);
hide();
else {
show("%4.2f V", state.battery_voltage);
@@
-192,7
+192,7
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class Apogee extends LaunchStatus {
void show (AltosState state, AltosListenerState listener_state) {
class Apogee extends LaunchStatus {
void show (AltosState state, AltosListenerState listener_state) {
- if (state == null || state.apogee_voltage == Altos
Record
.MISSING)
+ if (state == null || state.apogee_voltage == Altos
Lib
.MISSING)
hide();
else {
show("%4.2f V", state.apogee_voltage);
hide();
else {
show("%4.2f V", state.apogee_voltage);
@@
-208,7
+208,7
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class Main extends LaunchStatus {
void show (AltosState state, AltosListenerState listener_state) {
class Main extends LaunchStatus {
void show (AltosState state, AltosListenerState listener_state) {
- if (state == null || state.main_voltage == Altos
Record
.MISSING)
+ if (state == null || state.main_voltage == Altos
Lib
.MISSING)
hide();
else {
show("%4.2f V", state.main_voltage);
hide();
else {
show("%4.2f V", state.main_voltage);
@@
-224,7
+224,7
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class LoggingReady extends LaunchStatus {
void show (AltosState state, AltosListenerState listener_state) {
class LoggingReady extends LaunchStatus {
void show (AltosState state, AltosListenerState listener_state) {
- if (state == null || state.flight == Altos
Record
.MISSING) {
+ if (state == null || state.flight == Altos
Lib
.MISSING) {
hide();
} else {
if (state.flight != 0) {
hide();
} else {
if (state.flight != 0) {
@@
-283,7
+283,7
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class ReceiverBattery extends LaunchStatus {
void show (AltosState state, AltosListenerState listener_state) {
class ReceiverBattery extends LaunchStatus {
void show (AltosState state, AltosListenerState listener_state) {
- if (listener_state == null || listener_state.battery == Altos
Record
.MISSING)
+ if (listener_state == null || listener_state.battery == Altos
Lib
.MISSING)
hide();
else {
show("%4.2f V", listener_state.battery);
hide();
else {
show("%4.2f V", listener_state.battery);
@@
-310,11
+310,11
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class PadLat extends LaunchValue {
void show (AltosState state, AltosListenerState listener_state) {
class PadLat extends LaunchValue {
void show (AltosState state, AltosListenerState listener_state) {
- double lat = Altos
Record
.MISSING;
+ double lat = Altos
Lib
.MISSING;
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 != Altos
Record
.MISSING) {
+ if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.lat != Altos
Lib
.MISSING) {
lat = state.gps.lat;
label = "Latitude";
} else {
lat = state.gps.lat;
label = "Latitude";
} else {
@@
-322,8
+322,8
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
label = "Pad Latitude";
}
}
label = "Pad Latitude";
}
}
- if (lat != Altos
Record
.MISSING) {
- show(pos(lat,"
E", "W
"));
+ if (lat != Altos
Lib
.MISSING) {
+ show(pos(lat,"
N", "S
"));
set_label(label);
} else
hide();
set_label(label);
} else
hide();
@@
-337,11
+337,11
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class PadLon extends LaunchValue {
void show (AltosState state, AltosListenerState listener_state) {
class PadLon extends LaunchValue {
void show (AltosState state, AltosListenerState listener_state) {
- double lon = Altos
Record
.MISSING;
+ double lon = Altos
Lib
.MISSING;
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 != Altos
Record
.MISSING) {
+ if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.lon != Altos
Lib
.MISSING) {
lon = state.gps.lon;
label = "Longitude";
} else {
lon = state.gps.lon;
label = "Longitude";
} else {
@@
-349,7
+349,7
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
label = "Pad Longitude";
}
}
label = "Pad Longitude";
}
}
- if (lon != Altos
Record
.MISSING) {
+ if (lon != Altos
Lib
.MISSING) {
show(pos(lon,"E", "W"));
set_label(label);
} else
show(pos(lon,"E", "W"));
set_label(label);
} else
@@
-364,11
+364,11
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class PadAlt extends LaunchValue {
void show (AltosState state, AltosListenerState listener_state) {
class PadAlt extends LaunchValue {
void show (AltosState state, AltosListenerState listener_state) {
- double alt = Altos
Record
.MISSING;
+ double alt = Altos
Lib
.MISSING;
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 != Altos
Record
.MISSING) {
+ if (state.state < AltosLib.ao_flight_pad && state.gps != null && state.gps.alt != Altos
Lib
.MISSING) {
alt = state.gps.alt;
label = "Altitude";
} else {
alt = state.gps.alt;
label = "Altitude";
} else {
@@
-376,7
+376,7
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
label = "Pad Altitude";
}
}
label = "Pad Altitude";
}
}
- if (alt != Altos
Record
.MISSING) {
+ if (alt != Altos
Lib
.MISSING) {
show("%4.0f m", state.gps.alt);
set_label(label);
} else
show("%4.0f m", state.gps.alt);
set_label(label);
} else