projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/test: Add EasyMini test mode
[fw/altos]
/
telegps
/
TeleGPSStatus.java
diff --git
a/telegps/TeleGPSStatus.java
b/telegps/TeleGPSStatus.java
index 050a844969821899abcf6e7477ee732aa9f09de4..e1be69a495717f156e1f5ea5d9a0c09e97eedc0e 100644
(file)
--- a/
telegps/TeleGPSStatus.java
+++ b/
telegps/TeleGPSStatus.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,8
+20,8
@@
package org.altusmetrum.telegps;
import java.awt.*;
import javax.swing.*;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
6
.*;
-import org.altusmetrum.altosuilib_
6
.*;
+import org.altusmetrum.altoslib_
12
.*;
+import org.altusmetrum.altosuilib_
12
.*;
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
@@
-74,11
+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.callsign != call) {
- value.setText(state.callsign);
- call = state.callsign;
+ AltosCalData cal_data = state.cal_data();
+ if (cal_data == null)
+ System.out.printf("null cal data?\n");
+ if (cal_data.callsign != call) {
+ value.setText(cal_data.callsign);
+ call = cal_data.callsign;
}
}
- if (
state
.callsign == null)
+ if (
cal_data
.callsign == null)
setVisible(false);
else
setVisible(true);
setVisible(false);
else
setVisible(true);
@@
-99,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.serial != serial) {
- if (state.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
.serial));
- serial =
state
.serial;
+ value.setText(String.format("%d",
cal_data
.serial));
+ serial =
cal_data
.serial;
}
}
}
}
@@
-125,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.flight != last_flight) {
- if (state.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
.flight));
- last_flight =
state
.flight;
+ value.setText(String.format("%d",
cal_data
.flight));
+ last_flight =
cal_data
.flight;
}
}
}
}