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 a71cdc10c0fc97f2305951365294cc165f1d3580..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.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -29,7 +30,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                JTextField      value;
                AltosLights     lights;
 
-               abstract void show(AltosState state, int crc_errors);
+               abstract void show(AltosState state, AltosListenerState listener_state);
 
                void show() {
                        label.setVisible(true);
@@ -108,7 +109,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        value.setText("");
                }
 
-               abstract void show(AltosState state, int crc_errors);
+               abstract void show(AltosState state, AltosListenerState listener_state);
 
                void show() {
                        label.setVisible(true);
@@ -192,7 +193,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        value2.setFont(Altos.value_font);
                }
 
-               abstract void show(AltosState state, int crc_errors);
+               abstract void show(AltosState state, AltosListenerState listener_state);
 
                void show(String v1, String v2) {
                        show();
@@ -244,8 +245,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        }
 
        class Height extends DescentValue {
-               void show (AltosState state, int crc_errors) {
-                       show(AltosConvert.height, state.height);
+               void show (AltosState state, AltosListenerState listener_state) {
+                       show(AltosConvert.height, state.height());
                }
                public Height (GridBagLayout layout, int x, int y) {
                        super (layout, x, y, "Height");
@@ -255,11 +256,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Height  height;
 
        class Speed extends DescentValue {
-               void show (AltosState state, int crc_errors) {
-                       double speed = state.speed;
-                       if (!state.ascent)
-                               speed = state.baro_speed;
-                       show(AltosConvert.speed, speed);
+               void show (AltosState state, AltosListenerState listener_state) {
+                       show(AltosConvert.speed, state.speed());
                }
                public Speed (GridBagLayout layout, int x, int y) {
                        super (layout, x, y, "Speed");
@@ -280,8 +278,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        }
 
        class Lat extends DescentValue {
-               void show (AltosState state, int crc_errors) {
-                       if (state.gps != null && state.gps.connected)
+               void show (AltosState state, AltosListenerState listener_state) {
+                       if (state.gps != null && state.gps.connected && state.gps.lat != AltosLib.MISSING)
                                show(pos(state.gps.lat,"N", "S"));
                        else
                                show("???");
@@ -294,8 +292,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Lat lat;
 
        class Lon extends DescentValue {
-               void show (AltosState state, int crc_errors) {
-                       if (state.gps != null && state.gps.connected)
+               void show (AltosState state, AltosListenerState listener_state) {
+                       if (state.gps != null && state.gps.connected && state.gps.lon != AltosLib.MISSING)
                                show(pos(state.gps.lon,"W", "E"));
                        else
                                show("???");
@@ -308,7 +306,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Lon lon;
 
        class Distance extends DescentValue {
-               void show(AltosState state, int crc_errors) {
+               void show(AltosState state, AltosListenerState listener_state) {
                        if (state.from_pad != null)
                                show(AltosConvert.distance, state.from_pad.distance);
                        else
@@ -321,12 +319,12 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        }
 
        Distance distance;
-               
+
 
        class Apogee extends DescentStatus {
-               void show (AltosState state, int crc_errors) {
-                       show("%4.2f V", state.drogue_sense);
-                       lights.set(state.drogue_sense > 3.2);
+               void show (AltosState state, AltosListenerState listener_state) {
+                       show("%4.2f V", state.apogee_voltage);
+                       lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
                }
                public Apogee (GridBagLayout layout, int y) {
                        super(layout, y, "Apogee Igniter Voltage");
@@ -336,9 +334,9 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Apogee apogee;
 
        class Main extends DescentStatus {
-               void show (AltosState state, int crc_errors) {
-                       show("%4.2f V", state.main_sense);
-                       lights.set(state.main_sense > 3.2);
+               void show (AltosState state, AltosListenerState listener_state) {
+                       show("%4.2f V", state.main_voltage);
+                       lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
                }
                public Main (GridBagLayout layout, int y) {
                        super(layout, y, "Main Igniter Voltage");
@@ -348,7 +346,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Main main;
 
        class Bearing extends DescentDualValue {
-               void show (AltosState state, int crc_errors) {
+               void show (AltosState state, AltosListenerState listener_state) {
                        if (state.from_pad != null) {
                                show( String.format("%3.0f°", state.from_pad.bearing),
                                      state.from_pad.bearing_words(
@@ -365,7 +363,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Bearing bearing;
 
        class Range extends DescentValue {
-               void show (AltosState state, int crc_errors) {
+               void show (AltosState state, AltosListenerState listener_state) {
                        show(AltosConvert.distance, state.range);
                }
                public Range (GridBagLayout layout, int x, int y) {
@@ -376,7 +374,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
        Range range;
 
        class Elevation extends DescentValue {
-               void show (AltosState state, int crc_errors) {
+               void show (AltosState state, AltosListenerState listener_state) {
                        show("%3.0f°", state.elevation);
                }
                public Elevation (GridBagLayout layout, int x, int y) {
@@ -412,16 +410,16 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                apogee.set_font();
        }
 
-       public void show(AltosState state, int crc_errors) {
-               height.show(state, crc_errors);
-               speed.show(state, crc_errors);
+       public void show(AltosState state, AltosListenerState listener_state) {
+               height.show(state, listener_state);
+               speed.show(state, listener_state);
                if (state.gps != null && state.gps.connected) {
-                       bearing.show(state, crc_errors);
-                       range.show(state, crc_errors);
-                       distance.show(state, crc_errors);
-                       elevation.show(state, crc_errors);
-                       lat.show(state, crc_errors);
-                       lon.show(state, crc_errors);
+                       bearing.show(state, listener_state);
+                       range.show(state, listener_state);
+                       distance.show(state, listener_state);
+                       elevation.show(state, listener_state);
+                       lat.show(state, listener_state);
+                       lon.show(state, listener_state);
                } else {
                        bearing.hide();
                        range.hide();
@@ -430,16 +428,20 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        lat.hide();
                        lon.hide();
                }
-               if (state.main_sense != AltosRecord.MISSING)
-                       main.show(state, crc_errors);
+               if (state.main_voltage != AltosLib.MISSING)
+                       main.show(state, listener_state);
                else
                        main.hide();
-               if (state.drogue_sense != AltosRecord.MISSING)
-                       apogee.show(state, crc_errors);
+               if (state.apogee_voltage != AltosLib.MISSING)
+                       apogee.show(state, listener_state);
                else
                        apogee.hide();
        }
 
+       public String getName() {
+               return "Descent";
+       }
+
        public AltosDescent() {
                layout = new GridBagLayout();