projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Report additional pyro channels via beeper
[fw/altos]
/
telegps
/
TeleGPSStatus.java
diff --git
a/telegps/TeleGPSStatus.java
b/telegps/TeleGPSStatus.java
index 14706877e9f71622bdea4fb9b5ecbff89dc29543..1d4415d6064d400444891ea769c3a0643a3ac0ea 100644
(file)
--- a/
telegps/TeleGPSStatus.java
+++ b/
telegps/TeleGPSStatus.java
@@
-19,8
+19,8
@@
package org.altusmetrum.telegps;
import java.awt.*;
import javax.swing.*;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
4
.*;
-import org.altusmetrum.altosuilib_
2
.*;
+import org.altusmetrum.altoslib_
5
.*;
+import org.altusmetrum.altosuilib_
3
.*;
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
@@
-83,6
+83,12
@@
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
else
setVisible(true);
}
else
setVisible(true);
}
+
+ public void reset() {
+ super.reset();
+ call = "";
+ }
+
public Call (GridBagLayout layout, int x) {
super (layout, x, "Callsign");
}
public Call (GridBagLayout layout, int x) {
super (layout, x, "Callsign");
}
@@
-101,6
+107,12
@@
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
serial = state.serial;
}
}
serial = state.serial;
}
}
+
+ public void reset() {
+ super.reset();
+ serial = -1;
+ }
+
public Serial (GridBagLayout layout, int x) {
super (layout, x, "Serial");
}
public Serial (GridBagLayout layout, int x) {
super (layout, x, "Serial");
}
@@
-121,6
+133,12
@@
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
last_flight = state.flight;
}
}
last_flight = state.flight;
}
}
+
+ public void reset() {
+ super.reset();
+ last_flight = -1;
+ }
+
public Flight (GridBagLayout layout, int x) {
super (layout, x, "Flight");
}
public Flight (GridBagLayout layout, int x) {
super (layout, x, "Flight");
}
@@
-143,6
+161,12
@@
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
rssi = new_rssi;
}
}
rssi = new_rssi;
}
}
+
+ public void reset() {
+ super.reset();
+ rssi = 10000;
+ }
+
public RSSI (GridBagLayout layout, int x) {
super (layout, x, "RSSI");
}
public RSSI (GridBagLayout layout, int x) {
super (layout, x, "RSSI");
}
@@
-162,6
+186,16
@@
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
last_secs = secs;
}
}
last_secs = secs;
}
}
+
+ void reset() {
+ super.reset();
+ last_secs = -1;
+ }
+
+ void disable() {
+ value.setText("");
+ }
+
public LastPacket(GridBagLayout layout, int x) {
super (layout, x, "Age");
}
public LastPacket(GridBagLayout layout, int x) {
super (layout, x, "Age");
}
@@
-169,6
+203,10
@@
public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
LastPacket last_packet;
LastPacket last_packet;
+ public void disable_receive() {
+ last_packet.disable();
+ }
+
public void reset () {
call.reset();
serial.reset();
public void reset () {
call.reset();
serial.reset();