removed ascent and descent code
authorBdale Garbee <bdale@gag.com>
Sun, 14 Jan 2018 19:46:16 +0000 (16:46 -0300)
committerBdale Garbee <bdale@gag.com>
Sun, 14 Jan 2018 19:46:16 +0000 (16:46 -0300)
teststand/AltosAscent.java [deleted file]
teststand/AltosDescent.java [deleted file]
teststand/AltosFlightStatusTableModel.java
teststand/AltosFlightUI.java
teststand/AltosLanded.java
teststand/Makefile.am

diff --git a/teststand/AltosAscent.java b/teststand/AltosAscent.java
deleted file mode 100644 (file)
index dfc5927..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package teststand;
-
-import java.util.*;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import org.altusmetrum.altoslib_12.*;
-import org.altusmetrum.altosuilib_12.*;
-
-public class AltosAscent extends AltosUIFlightTab {
-       JLabel  cur, max;
-
-       class Height extends AltosUIUnitsIndicator {
-
-               public double value(AltosState state, int i) {
-                       if (i == 0)
-                               return state.height();
-                       else
-                               return state.max_height();
-               }
-
-               public Height(Container container, int y) {
-                       super(container, y, AltosConvert.height, "Height", 2, false, 1);
-               }
-       }
-
-       class Speed extends AltosUIUnitsIndicator {
-               public double value(AltosState state, int i) {
-                       if (i == 0)
-                               return state.speed();
-                       else
-                               return state.max_speed();
-               }
-
-               public Speed(Container container, int y) {
-                       super(container, y, AltosConvert.speed, "Speed", 2, false, 1);
-               }
-       }
-
-       class Accel extends AltosUIUnitsIndicator {
-               public boolean hide(double v) { return v == AltosLib.MISSING; }
-
-               public double value(AltosState state, int i) {
-                       if (i == 0)
-                               return state.acceleration();
-                       else
-                               return state.max_acceleration();
-               }
-
-               public Accel(Container container, int y) {
-                       super(container, y, AltosConvert.accel, "Acceleration", 2, false, 1);
-               }
-       }
-
-       class Orient extends AltosUIUnitsIndicator {
-
-               public boolean hide(double v) { return v == AltosLib.MISSING; }
-
-               public double value(AltosState state, int i) {
-                       if (i == 0)
-                               return state.orient();
-                       else
-                               return state.max_orient();
-               }
-
-               public Orient(Container container, int y) {
-                       super(container, y, AltosConvert.orient, "Tilt Angle", 2, false, 1);
-               }
-
-       }
-
-       class Apogee extends AltosUIUnitsIndicator {
-
-               public double value(AltosState state, int i) {
-                       return state.apogee_voltage;
-               }
-
-               public boolean good(double v) { return v >= AltosLib.ao_igniter_good; }
-               public boolean hide(double v) { return v == AltosLib.MISSING; }
-
-               public Apogee (Container container, int y) {
-                       super(container, y, AltosConvert.voltage, "Apogee Igniter Voltage", 1, true, 2);
-               }
-       }
-
-       class Main extends AltosUIUnitsIndicator {
-               public double value(AltosState state, int i) {
-                       return state.main_voltage;
-               }
-
-               public boolean good(double v) { return v >= AltosLib.ao_igniter_good; }
-               public boolean hide(double v) { return v == AltosLib.MISSING; }
-
-               public Main (Container container, int y) {
-                       super(container, y, AltosConvert.voltage, "Main Igniter Voltage", 1, true, 2);
-               }
-       }
-
-       class Lat extends AltosUIUnitsIndicator {
-
-               public boolean hide(AltosState state, int i) {
-                       return state.gps == null || !state.gps.connected;
-               }
-
-               public double value(AltosState state, int i) {
-                       if (state.gps == null)
-                               return AltosLib.MISSING;
-                       if (!state.gps.connected)
-                               return AltosLib.MISSING;
-                       return state.gps.lat;
-               }
-
-               Lat (Container container, int y) {
-                       super (container, y, AltosConvert.latitude, "Latitude", 1, false, 2);
-               }
-       }
-
-       class Lon extends AltosUIUnitsIndicator {
-
-               public boolean hide(AltosState state, int i) {
-                       return state.gps == null || !state.gps.connected;
-               }
-
-               public double value(AltosState state, int i) {
-                       if (state.gps == null)
-                               return AltosLib.MISSING;
-                       if (!state.gps.connected)
-                               return AltosLib.MISSING;
-                       return state.gps.lon;
-               }
-
-               Lon (Container container, int y) {
-                       super (container, y, AltosConvert.longitude, "Longitude", 1, false, 2);
-               }
-       }
-
-       public void font_size_changed(int font_size) {
-               super.font_size_changed(font_size);
-               cur.setFont(AltosUILib.label_font);
-               max.setFont(AltosUILib.label_font);
-       }
-
-       public void labels(GridBagLayout layout, int y) {
-               GridBagConstraints      c;
-
-               cur = new JLabel("Current");
-               cur.setFont(AltosUILib.label_font);
-               c = new GridBagConstraints();
-               c.gridx = 2; c.gridy = y;
-               c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
-               layout.setConstraints(cur, c);
-               add(cur);
-
-               max = new JLabel("Maximum");
-               max.setFont(AltosUILib.label_font);
-               c.gridx = 3; c.gridy = y;
-               layout.setConstraints(max, c);
-               add(max);
-       }
-
-       public String getName() {
-               return "Ascent";
-       }
-
-       public AltosAscent() {
-               int y = 0;
-               labels(layout, y++);
-               add(new Height(this, y++));
-               add(new Speed(this, y++));
-               add(new Accel(this, y++));
-               add(new Orient(this, y++));
-               add(new Lat(this, y++));
-               add(new Lon(this, y++));
-               add(new Apogee(this, y++));
-               add(new Main(this, y++));
-       }
-}
diff --git a/teststand/AltosDescent.java b/teststand/AltosDescent.java
deleted file mode 100644 (file)
index 5d8d8de..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package teststand;
-
-import java.util.*;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import org.altusmetrum.altoslib_12.*;
-import org.altusmetrum.altosuilib_12.*;
-
-public class AltosDescent extends AltosUIFlightTab {
-
-       class Height extends AltosUIUnitsIndicator {
-               public double value(AltosState state, int i) { return state.height(); }
-
-               public Height (Container container, int x, int y) {
-                       super (container, x, y, AltosConvert.height, "Height");
-               }
-       }
-
-       class Speed extends AltosUIUnitsIndicator {
-               public double value(AltosState state, int i) { return state.speed(); }
-
-               public Speed (Container container, int x, int y) {
-                       super (container, x, y, AltosConvert.speed, "Speed");
-               }
-       }
-
-       class Lat extends AltosUIUnitsIndicator {
-
-               public boolean hide (AltosState state, int i) { return state.gps == null || !state.gps.connected; }
-
-               public double value(AltosState state, int i) {
-                       if (state.gps == null)
-                               return AltosLib.MISSING;
-                       if (!state.gps.connected)
-                               return AltosLib.MISSING;
-                       return state.gps.lat;
-               }
-
-               public Lat (Container container, int x, int y) {
-                       super (container, x, y, AltosConvert.latitude, "Latitude");
-               }
-       }
-
-       class Lon extends AltosUIUnitsIndicator {
-               public boolean hide (AltosState state, int i) { return state.gps == null || !state.gps.connected; }
-
-               public double value(AltosState state, int i) {
-                       if (state.gps == null)
-                               return AltosLib.MISSING;
-                       if (!state.gps.connected)
-                               return AltosLib.MISSING;
-                       return state.gps.lon;
-               }
-
-               public Lon (Container container, int x, int y) {
-                       super (container, x, y, AltosConvert.longitude, "Longitude");
-               }
-       }
-
-       class Apogee extends AltosUIUnitsIndicator {
-               public boolean hide(double v) { return v == AltosLib.MISSING; }
-               public double value(AltosState state, int i) { return state.apogee_voltage; }
-               public double good() { return AltosLib.ao_igniter_good; }
-
-               public Apogee (Container container, int y) {
-                       super(container, 0, y, 3, AltosConvert.voltage, "Apogee Igniter Voltage", 1, true, 3);
-               }
-       }
-
-       class Main extends AltosUIUnitsIndicator {
-               public boolean hide(double v) { return v == AltosLib.MISSING; }
-               public double value(AltosState state, int i) { return state.main_voltage; }
-               public double good() { return AltosLib.ao_igniter_good; }
-
-               public Main (Container container, int y) {
-                       super(container, 0, y, 3, AltosConvert.voltage, "Main Igniter Voltage", 1, true, 3);
-               }
-       }
-
-       class Distance extends AltosUIUnitsIndicator {
-               public double value(AltosState state, int i) {
-                       if (state.from_pad != null)
-                               return state.from_pad.distance;
-                       else
-                               return AltosLib.MISSING;
-               }
-
-               public Distance(Container container, int x, int y) {
-                       super(container, x, y, AltosConvert.distance, "Ground Distance");
-               }
-       }
-
-       class Range extends AltosUIUnitsIndicator {
-               public double value(AltosState state, int i) {
-                       return state.range;
-               }
-               public Range (Container container, int x, int y) {
-                       super (container, x, y, AltosConvert.distance, "Range");
-               }
-       }
-
-       class Bearing extends AltosUIIndicator {
-               public void show (AltosState state, AltosListenerState listener_state) {
-                       if (state.from_pad != null && state.from_pad.bearing != AltosLib.MISSING) {
-                               show( String.format("%3.0f°", state.from_pad.bearing),
-                                     state.from_pad.bearing_words(
-                                             AltosGreatCircle.BEARING_LONG));
-                       } else {
-                               show("Missing", "Missing");
-                       }
-               }
-               public Bearing (Container container, int x, int y) {
-                       super (container, x, y, 1, "Bearing", 2, false, 1, 2);
-               }
-       }
-
-       class Elevation extends AltosUIIndicator {
-               public void show (AltosState state, AltosListenerState listener_state) {
-                       if (state.elevation == AltosLib.MISSING)
-                               show("Missing");
-                       else
-                               show("%3.0f°", state.elevation);
-               }
-               public Elevation (Container container, int x, int y) {
-                       super (container, x, y, "Elevation", 1, false, 1);
-               }
-       }
-
-       public String getName() {
-               return "Descent";
-       }
-
-       public AltosDescent() {
-               /* Elements in descent display */
-               add(new Speed(this, 0, 0));
-               add(new Height(this, 2, 0));
-               add(new Elevation(this, 0, 1));
-               add(new Range(this, 2, 1));
-               add(new Bearing(this, 0, 2));
-               add(new Distance(this, 0, 3));
-               add(new Lat(this, 0, 4));
-               add(new Lon(this, 2, 4));
-               add(new Apogee(this, 5));
-               add(new Main(this, 6));
-       }
-}
index 63008adfc48eb36e458b056bd59cb0c6d9f9dc6b..150a41eaef77ca9fae8db827cf77eebef86c18d4 100644 (file)
@@ -61,8 +61,6 @@ public class AltosFlightStatusTableModel extends AbstractTableModel {
                setValueAt(state.data.state(), 1);
                setValueAt(state.data.rssi, 2);
                double speed = state.baro_speed;
-               if (state.ascent)
-                       speed = state.speed;
                setValueAt(String.format("%1.0f", AltosConvert.speed(speed)), 3);
        }
 }
index fa0814daa0a43b71092001a9ef0bbd29e44fa1aa..e0605085115580cf479b4bccbc808fbe2047bdb5 100644 (file)
@@ -37,8 +37,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
        AltosPad        pad;
        AltosIgnitor    igniter;
-       AltosAscent     ascent;
-       AltosDescent    descent;
        AltosLanded     landed;
        AltosCompanionInfo      companion;
        AltosUIMap      sitemap;
@@ -56,12 +54,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
        JComponent which_tab(AltosState state) {
                if (state.state() < Altos.ao_flight_boost)
                        return pad;
-               if (state.state() <= Altos.ao_flight_coast)
-                       return ascent;
-               if (state.state() <= Altos.ao_flight_main)
-                       return descent;
-               if (state.state() == AltosLib.ao_flight_stateless)
-                       return descent;
                return landed;
        }
 
@@ -106,9 +98,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
                if (state.state() != Altos.ao_flight_startup) {
                        if (!has_state) {
                                pane.setTitleAt(0, "Launch Pad");
-                               pane.add(ascent, 1);
-                               pane.add(descent, 2);
-                               pane.add(landed, 3);
+                               pane.add(landed, 1);
                                has_state = true;
                        }
                }
@@ -273,10 +263,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
                igniter = new AltosIgnitor();
                displays.add(igniter);
-               ascent = new AltosAscent();
-               displays.add(ascent);
-               descent = new AltosDescent();
-               displays.add(descent);
                landed = new AltosLanded(reader);
                displays.add(landed);
 
index c18c0e7b6edc50f1fb33df56a9b9e091352a1eea..b250bff0b342e37a956a031773be439ed816064e 100644 (file)
@@ -165,7 +165,7 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener {
        public AltosLanded(AltosFlightReader in_reader) {
                reader = in_reader;
 
-               /* Elements in descent display */
+               /* Elements in display */
                add(new Bearing(this, 0));
                add(new Distance(this, 1));
                add(new Lat(this, 2));
index 5ba8fc3f587130806a11291bae9b21b7ec7158a3..ba9cf0a0fa0441f120dad070eb15031a7abd5076 100644 (file)
@@ -11,7 +11,6 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../altoslib/*:../alto
 bin_SCRIPTS=teststand
 
 teststand_JAVA = \
-       AltosAscent.java \
        AltosChannelMenu.java \
        AltosCompanionInfo.java \
        AltosConfigFC.java \
@@ -20,7 +19,6 @@ teststand_JAVA = \
        AltosConfigureUI.java \
        AltosConfigTD.java \
        AltosConfigTDUI.java \
-       AltosDescent.java \
        AltosFlightStatus.java \
        AltosFlightStatusUpdate.java \
        AltosFlightUI.java \