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

[fw/altos] / altosui / AltosDescent.java

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 77776ff2ce3417d8b847874505dd1c8572228dc3..5cb693fe99ed89e404ed3e5bb76530154adad1d2 100644 (file)
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.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 AltosDescent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -318,12 +319,12 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        }
 
        Distance distance;
-               
+
 
        class Apogee extends DescentStatus {
                void show (AltosState state, AltosListenerState listener_state) {
                        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) {
                        super(layout, y, "Apogee Igniter Voltage");
@@ -335,7 +336,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        class Main extends DescentStatus {
                void show (AltosState state, AltosListenerState listener_state) {
                        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) {
                        super(layout, y, "Main Igniter Voltage");