altoslib/altosuilib: Change versions to altoslib:4, altosuilib:2

[fw/altos] / altosui / AltosPad.java

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index b35bd23a8626f14032344b671dcd91575a385c1a..a6ac70db5efc9de4d582de91df0f1f7722dfa509 100644 (file)
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -19,7 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -69,7 +70,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                public void set_label(String text) {
                        label.setText(text);
                }
-               
+
                public LaunchStatus (GridBagLayout layout, int y, String text) {
                        GridBagConstraints      c = new GridBagConstraints();
                        c.weighty = 1;
@@ -142,7 +143,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                public void set_label(String text) {
                        label.setText(text);
                }
-               
+
                void reset() {
                        value.setText("");
                }
@@ -180,7 +181,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                                hide();
                        else {
                                show("%4.2f V", state.battery_voltage);
-                               lights.set(state.battery_voltage > 3.7);
+                               lights.set(state.battery_voltage >= AltosLib.ao_battery_good);
                        }
                }
                public Battery (GridBagLayout layout, int y) {
@@ -196,7 +197,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                                hide();
                        else {
                                show("%4.2f V", state.apogee_voltage);
-                               lights.set(state.apogee_voltage > 3.7);
+                               lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
                        }
                }
                public Apogee (GridBagLayout layout, int y) {
@@ -212,7 +213,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                                hide();
                        else {
                                show("%4.2f V", state.main_voltage);
-                               lights.set(state.main_voltage > 3.7);
+                               lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
                        }
                }
                public Main (GridBagLayout layout, int y) {
@@ -287,7 +288,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                                hide();
                        else {
                                show("%4.2f V", listener_state.battery);
-                               lights.set(listener_state.battery > 3.7);
+                               lights.set(listener_state.battery > AltosLib.ao_battery_good);
                        }
                }
                public ReceiverBattery (GridBagLayout layout, int y) {
@@ -414,7 +415,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                pad_lon.set_font();
                pad_alt.set_font();
        }
-       
+
        public void show(AltosState state, AltosListenerState listener_state) {
                battery.show(state, listener_state);
                apogee.show(state, listener_state);