Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / telegps / TeleGPSState.java

diff --git a/telegps/TeleGPSState.java b/telegps/TeleGPSState.java
index 18f500b907d56ef726d65cbfd4b52d6cdcdabfe3..7c410e9815a8bc45b0ba7bc439687a711a87e9b9 100644 (file)
--- a/telegps/TeleGPSState.java
+++ b/telegps/TeleGPSState.java
@@ -21,8 +21,8 @@ import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altosuilib_7.*;
 
 public class TeleGPSState extends AltosUIFlightTab {
 
@@ -161,6 +161,26 @@ public class TeleGPSState extends AltosUIFlightTab {
                }
        }
 
+       class ReceiverBattery extends AltosUIVoltageIndicator {
+
+               public double voltage(AltosState state) { return AltosLib.MISSING; }
+
+               public double good() { return AltosLib.ao_battery_good; }
+
+               public boolean hide(AltosState state, AltosListenerState listener_state, int i) {
+                       return value(state, listener_state, i) == AltosLib.MISSING;
+               }
+
+               public double value(AltosState state, AltosListenerState listener_state, int i) {
+                       if (listener_state == null)
+                               return AltosLib.MISSING;
+                       return listener_state.battery;
+               }
+
+               public ReceiverBattery (AltosUIFlightTab container, int y) {
+                       super(container, y, "Receiver Battery", 2);
+               }
+       }
 
        public void labels(Container container, int y) {
                GridBagLayout           layout = (GridBagLayout)(container.getLayout());
@@ -203,5 +223,6 @@ public class TeleGPSState extends AltosUIFlightTab {
                add(new FirmwareVersion(this, y++));
                add(new FlightLogMax(this, y++));
                add(new BatteryVoltage(this, y++));
+               add(new ReceiverBattery(this, y++));
        }
 }