projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Execute self-test on MMA655X part
[fw/altos]
/
altosui
/
AltosFlightStatus.java
diff --git
a/altosui/AltosFlightStatus.java
b/altosui/AltosFlightStatus.java
index d2910414dec132af46e4fecb4e168052068073af..c6d75420fba38af29e9f237097e53481f56ad610 100644
(file)
--- a/
altosui/AltosFlightStatus.java
+++ b/
altosui/AltosFlightStatus.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_
3
.*;
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
@@
-65,7
+65,7
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
class Call extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
class Call extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
- value.setText(state.
data.
callsign);
+ value.setText(state.callsign);
}
public Call (GridBagLayout layout, int x) {
super (layout, x, "Callsign");
}
public Call (GridBagLayout layout, int x) {
super (layout, x, "Callsign");
@@
-76,10
+76,10
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
class Serial extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
class Serial extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
- if (state.
data.serial == AltosRecord
.MISSING)
+ if (state.
serial == AltosLib
.MISSING)
value.setText("none");
else
value.setText("none");
else
- value.setText(String.format("%d", state.
data.
serial));
+ value.setText(String.format("%d", state.serial));
}
public Serial (GridBagLayout layout, int x) {
super (layout, x, "Serial");
}
public Serial (GridBagLayout layout, int x) {
super (layout, x, "Serial");
@@
-90,10
+90,10
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
class Flight extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
class Flight extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
- if (state.
data.flight == AltosRecord
.MISSING)
+ if (state.
flight == AltosLib
.MISSING)
value.setText("none");
else
value.setText("none");
else
- value.setText(String.format("%d", state.
data.
flight));
+ value.setText(String.format("%d", state.flight));
}
public Flight (GridBagLayout layout, int x) {
super (layout, x, "Flight");
}
public Flight (GridBagLayout layout, int x) {
super (layout, x, "Flight");
@@
-104,7
+104,7
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
class FlightState extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
class FlightState extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
- value.setText(state.
data.stat
e());
+ value.setText(state.
state_nam
e());
}
public FlightState (GridBagLayout layout, int x) {
super (layout, x, "State");
}
public FlightState (GridBagLayout layout, int x) {
super (layout, x, "State");
@@
-115,7
+115,7
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
class RSSI extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
class RSSI extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
- value.setText(String.format("%d", state.
data.rssi
));
+ value.setText(String.format("%d", state.
rssi()
));
}
public RSSI (GridBagLayout layout, int x) {
super (layout, x, "RSSI");
}
public RSSI (GridBagLayout layout, int x) {
super (layout, x, "RSSI");
@@
-126,7
+126,7
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
class LastPacket extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
class LastPacket extends FlightValue {
void show(AltosState state, AltosListenerState listener_state) {
- long secs = (System.currentTimeMillis() - state.re
port
_time + 500) / 1000;
+ long secs = (System.currentTimeMillis() - state.re
ceived
_time + 500) / 1000;
value.setText(String.format("%d", secs));
}
public LastPacket(GridBagLayout layout, int x) {
value.setText(String.format("%d", secs));
}
public LastPacket(GridBagLayout layout, int x) {