projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telefireone-v1.0: Turn off USE_INTERNAL_FLASH
[fw/altos]
/
telegps
/
TeleGPSStatus.java
diff --git
a/telegps/TeleGPSStatus.java
b/telegps/TeleGPSStatus.java
index 15292fe56640823a38b06b93139b2c058a020807..493917e568ecac679d87506f3ed375f01f0bda6d 100644
(file)
--- a/
telegps/TeleGPSStatus.java
+++ b/
telegps/TeleGPSStatus.java
@@
-20,8
+20,8
@@
package org.altusmetrum.telegps;
import java.awt.*;
import javax.swing.*;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_1
2
.*;
-import org.altusmetrum.altosuilib_1
2
.*;
+import org.altusmetrum.altoslib_1
3
.*;
+import org.altusmetrum.altosuilib_1
3
.*;
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
@@
-75,13
+75,14
@@
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
String call;
void show(AltosState state, AltosListenerState listener_state) {
String call;
void show(AltosState state, AltosListenerState listener_state) {
- if (state.cal_data == null)
+ AltosCalData cal_data = state.cal_data();
+ if (cal_data == null)
System.out.printf("null cal data?\n");
System.out.printf("null cal data?\n");
- if (
state.
cal_data.callsign != call) {
- value.setText(
state.
cal_data.callsign);
- call =
state.
cal_data.callsign;
+ if (cal_data.callsign != call) {
+ value.setText(cal_data.callsign);
+ call = cal_data.callsign;
}
}
- if (
state.
cal_data.callsign == null)
+ if (cal_data.callsign == null)
setVisible(false);
else
setVisible(true);
setVisible(false);
else
setVisible(true);
@@
-102,12
+103,13
@@
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
class Serial extends Value {
int serial = -1;
void show(AltosState state, AltosListenerState listener_state) {
class Serial extends Value {
int serial = -1;
void show(AltosState state, AltosListenerState listener_state) {
- if (state.cal_data.serial != serial) {
- if (state.cal_data.serial == AltosLib.MISSING)
+ AltosCalData cal_data = state.cal_data();
+ if (cal_data.serial != serial) {
+ if (cal_data.serial == AltosLib.MISSING)
value.setText("none");
else
value.setText("none");
else
- value.setText(String.format("%d",
state.
cal_data.serial));
- serial =
state.
cal_data.serial;
+ value.setText(String.format("%d", cal_data.serial));
+ serial = cal_data.serial;
}
}
}
}
@@
-128,12
+130,13
@@
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
int last_flight = -1;
void show(AltosState state, AltosListenerState listener_state) {
int last_flight = -1;
void show(AltosState state, AltosListenerState listener_state) {
- if (state.cal_data.flight != last_flight) {
- if (state.cal_data.flight == AltosLib.MISSING)
+ AltosCalData cal_data = state.cal_data();
+ if (cal_data.flight != last_flight) {
+ if (cal_data.flight == AltosLib.MISSING)
value.setText("none");
else
value.setText("none");
else
- value.setText(String.format("%d",
state.
cal_data.flight));
- last_flight =
state.
cal_data.flight;
+ value.setText(String.format("%d", cal_data.flight));
+ last_flight = cal_data.flight;
}
}
}
}