Merge branch 'master' of git://git.gag.com/fw/altos
authorAnthony Towns <aj@erisian.com.au>
Fri, 24 Sep 2010 00:28:06 +0000 (10:28 +1000)
committerAnthony Towns <aj@erisian.com.au>
Fri, 24 Sep 2010 00:28:06 +0000 (10:28 +1000)
ao-tools/altosui/AltosInfoTable.java [new file with mode: 0644]
ao-tools/altosui/AltosState.java
ao-tools/altosui/AltosStatusTable.java [new file with mode: 0644]
ao-tools/altosui/AltosUI.java
ao-tools/altosui/Makefile-standalone
ao-tools/altosui/Makefile.am

diff --git a/ao-tools/altosui/AltosInfoTable.java b/ao-tools/altosui/AltosInfoTable.java
new file mode 100644 (file)
index 0000000..9964ab1
--- /dev/null
@@ -0,0 +1,221 @@
+/*
+ * 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; version 2 of the License.
+ *
+ * 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 altosui;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import javax.swing.table.*;
+import java.io.*;
+import java.util.*;
+import java.text.*;
+import java.util.prefs.*;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import altosui.AltosFlightInfoTableModel;
+import altosui.AltosState;
+
+public class AltosInfoTable {
+       private Box                       box;
+       private JTable                    table[];
+       private AltosFlightInfoTableModel model[];
+       private Box                       ibox[];
+
+       private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 14);
+       private Font infoValueFont = new Font("Monospaced", Font.PLAIN, 14);
+
+       static final int info_columns = 3;
+       static final int info_rows = 17;
+
+       public AltosInfoTable() {
+               box = Box.createHorizontalBox();
+               model = new AltosFlightInfoTableModel[info_columns];
+               table = new JTable[info_columns];
+               ibox = new Box[info_columns];
+               for (int i = 0; i < info_columns; i++) {
+                       model[i] = new AltosFlightInfoTableModel();
+                       table[i] = new JTable(model[i]);
+                       ibox[i] = box.createVerticalBox();
+
+                       table[i].setFont(infoValueFont);
+                       table[i].setRowHeight(rowHeight());
+                       table[i].setShowGrid(true);
+                       ibox[i].add(table[i].getTableHeader());
+                       ibox[i].add(table[i]);
+                       box.add(ibox[i]);
+               }
+       }
+
+       public int rowHeight() {
+               FontMetrics     infoValueMetrics = table[0].getFontMetrics(infoValueFont);
+               return (infoValueMetrics.getHeight() + infoValueMetrics.getLeading()) * 20 / 10;
+       }
+
+       public int columnWidth() {
+               FontMetrics     infoValueMetrics = table[0].getFontMetrics(infoValueFont);
+               return infoValueMetrics.charWidth('0') * 20 * 2;
+       }
+
+       public int height() {
+               return rowHeight() * info_rows;
+       }
+
+       public int width() {
+               return columnWidth() * info_columns;
+       }
+
+       public Box box() {
+               return box;
+       }
+
+       void info_reset() {
+               for (int i = 0; i < info_columns; i++)
+                       model[i].resetRow();
+       }
+
+       void info_add_row(int col, String name, String value) {
+               model[col].addRow(name, value);
+       }
+
+       void info_add_row(int col, String name, String format, Object... parameters) {
+               model[col].addRow(name, String.format(format, parameters));
+       }
+
+       void info_add_deg(int col, String name, double v, int pos, int neg) {
+               int     c = pos;
+               if (v < 0) {
+                       c = neg;
+                       v = -v;
+               }
+               double  deg = Math.floor(v);
+               double  min = (v - deg) * 60;
+
+               model[col].addRow(name, String.format("%3.0f°%08.5f'", deg, min));
+       }
+
+       void info_finish() {
+               for (int i = 0; i < info_columns; i++)
+                       model[i].finish();
+       }
+
+       public void clear() {
+               info_reset();
+               info_finish();
+       }
+
+       public void show(AltosState state, int crc_errors) {
+               if (state == null)
+                       return;
+               info_reset();
+               info_add_row(0, "Rocket state", "%s", state.data.state());
+               info_add_row(0, "Callsign", "%s", state.data.callsign);
+               info_add_row(0, "Rocket serial", "%6d", state.data.serial);
+               info_add_row(0, "Rocket flight", "%6d", state.data.flight);
+
+               info_add_row(0, "RSSI", "%6d    dBm", state.data.rssi);
+               info_add_row(0, "CRC Errors", "%6d", crc_errors);
+               info_add_row(0, "Height", "%6.0f    m", state.height);
+               info_add_row(0, "Max height", "%6.0f    m", state.max_height);
+               info_add_row(0, "Acceleration", "%8.1f  m/s²", state.acceleration);
+               info_add_row(0, "Max acceleration", "%8.1f  m/s²", state.max_acceleration);
+               info_add_row(0, "Speed", "%8.1f  m/s", state.ascent ? state.speed : state.baro_speed);
+               info_add_row(0, "Max Speed", "%8.1f  m/s", state.max_speed);
+               info_add_row(0, "Temperature", "%9.2f °C", state.temperature);
+               info_add_row(0, "Battery", "%9.2f V", state.battery);
+               info_add_row(0, "Drogue", "%9.2f V", state.drogue_sense);
+               info_add_row(0, "Main", "%9.2f V", state.main_sense);
+               info_add_row(0, "Pad altitude", "%6.0f    m", state.ground_altitude);
+               if (state.gps == null) {
+                       info_add_row(1, "GPS", "not available");
+               } else {
+                       if (state.gps_ready)
+                               info_add_row(1, "GPS state", "%s", "ready");
+                       else
+                               info_add_row(1, "GPS state", "wait (%d)",
+                                            state.gps_waiting);
+                       if (state.data.gps.locked)
+                               info_add_row(1, "GPS", "   locked");
+                       else if (state.data.gps.connected)
+                               info_add_row(1, "GPS", " unlocked");
+                       else
+                               info_add_row(1, "GPS", "  missing");
+                       info_add_row(1, "Satellites", "%6d", state.data.gps.nsat);
+                       info_add_deg(1, "Latitude", state.gps.lat, 'N', 'S');
+                       info_add_deg(1, "Longitude", state.gps.lon, 'E', 'W');
+                       info_add_row(1, "GPS altitude", "%6d", state.gps.alt);
+                       info_add_row(1, "GPS height", "%6.0f", state.gps_height);
+
+                       /* The SkyTraq GPS doesn't report these values */
+                       if (false) {
+                               info_add_row(1, "GPS ground speed", "%8.1f m/s %3d°",
+                                            state.gps.ground_speed,
+                                            state.gps.course);
+                               info_add_row(1, "GPS climb rate", "%8.1f m/s",
+                                            state.gps.climb_rate);
+                               info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
+                                            state.gps.h_error, state.gps.v_error);
+                       }
+                       info_add_row(1, "GPS hdop", "%8.1f", state.gps.hdop);
+
+                       if (state.npad > 0) {
+                               if (state.from_pad != null) {
+                                       info_add_row(1, "Distance from pad", "%6d m",
+                                                    (int) (state.from_pad.distance + 0.5));
+                                       info_add_row(1, "Direction from pad", "%6d°",
+                                                    (int) (state.from_pad.bearing + 0.5));
+                                       info_add_row(1, "Elevation from pad", "%6d°",
+                                                    (int) (state.elevation + 0.5));
+                                       info_add_row(1, "Range from pad", "%6d m",
+                                                    (int) (state.range + 0.5));
+                               } else {
+                                       info_add_row(1, "Distance from pad", "unknown");
+                                       info_add_row(1, "Direction from pad", "unknown");
+                                       info_add_row(1, "Elevation from pad", "unknown");
+                                       info_add_row(1, "Range from pad", "unknown");
+                               }
+                               info_add_deg(1, "Pad latitude", state.pad_lat, 'N', 'S');
+                               info_add_deg(1, "Pad longitude", state.pad_lon, 'E', 'W');
+                               info_add_row(1, "Pad GPS alt", "%6.0f m", state.pad_alt);
+                       }
+                       info_add_row(1, "GPS date", "%04d-%02d-%02d",
+                                      state.gps.year,
+                                      state.gps.month,
+                                      state.gps.day);
+                       info_add_row(1, "GPS time", "  %02d:%02d:%02d",
+                                      state.gps.hour,
+                                      state.gps.minute,
+                                      state.gps.second);
+                       int     nsat_vis = 0;
+                       int     c;
+
+                       if (state.gps.cc_gps_sat == null)
+                               info_add_row(2, "Satellites Visible", "%4d", 0);
+                       else {
+                               info_add_row(2, "Satellites Visible", "%4d", state.gps.cc_gps_sat.length);
+                               for (c = 0; c < state.gps.cc_gps_sat.length; c++) {
+                                       info_add_row(2, "Satellite id,C/N0",
+                                                    "%4d, %4d",
+                                                    state.gps.cc_gps_sat[c].svid,
+                                                    state.gps.cc_gps_sat[c].c_n0);
+                               }
+                       }
+               }
+               info_finish();
+       }
+}
index 90e73f5eff42a3aadd83b4322047ee1e2cb029cf..1048bb51b09ca8faee0dccb4c4953850d135c2cf 100644 (file)
@@ -60,6 +60,7 @@ public class AltosState {
        static final int MIN_PAD_SAMPLES = 10;
 
        int     npad;
+       int     ngps;
        int     gps_waiting;
        boolean gps_ready;
 
@@ -97,6 +98,7 @@ public class AltosState {
 
                        /* Preserve any existing gps data */
                        npad = prev_state.npad;
+                       ngps = prev_state.ngps;
                        gps = prev_state.gps;
                        pad_lat = prev_state.pad_lat;
                        pad_lon = prev_state.pad_lon;
@@ -120,15 +122,23 @@ public class AltosState {
                                baro_speed = prev_state.baro_speed;
                } else {
                        npad = 0;
+                       ngps = 0;
                        gps = null;
                        baro_speed = 0;
                        time_change = 0;
                }
 
                if (state == Altos.ao_flight_pad) {
-                       if (data.gps != null && data.gps.locked) {
+
+                       /* Track consecutive 'good' gps reports, waiting for 10 of them */
+                       if (data.gps != null && data.gps.locked && data.gps.nsat >= 4)
                                npad++;
-                               if (npad > 1) {
+                       else
+                               npad = 0;
+
+                       /* Average GPS data while on the pad */
+                       if (data.gps != null && data.gps.locked && data.gps.nsat >= 4) {
+                               if (ngps > 1) {
                                        /* filter pad position */
                                        pad_lat = (pad_lat * 31.0 + data.gps.lat) / 32.0;
                                        pad_lon = (pad_lon * 31.0 + data.gps.lon) / 32.0;
@@ -138,8 +148,7 @@ public class AltosState {
                                        pad_lon = data.gps.lon;
                                        pad_alt = data.gps.alt;
                                }
-                       } else {
-                               npad = 0;
+                               ngps++;
                        }
                }
 
@@ -163,13 +172,13 @@ public class AltosState {
                if (data.gps != null) {
                        if (gps == null || !gps.locked || data.gps.locked)
                                gps = data.gps;
-                       if (npad > 0 && gps.locked) {
+                       if (ngps > 0 && gps.locked) {
                                from_pad = new AltosGreatCircle(pad_lat, pad_lon, gps.lat, gps.lon);
                        }
                }
                elevation = 0;
                range = -1;
-               if (npad > 0) {
+               if (ngps > 0) {
                        gps_height = gps.alt - pad_alt;
                        if (from_pad != null) {
                                elevation = Math.atan2(height, from_pad.distance) * 180 / Math.PI;
diff --git a/ao-tools/altosui/AltosStatusTable.java b/ao-tools/altosui/AltosStatusTable.java
new file mode 100644 (file)
index 0000000..3965a57
--- /dev/null
@@ -0,0 +1,73 @@
+/*
+ * 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; version 2 of the License.
+ *
+ * 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 altosui;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import javax.swing.table.*;
+import java.io.*;
+import java.util.*;
+import java.text.*;
+import java.util.prefs.*;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import altosui.AltosFlightStatusTableModel;
+import altosui.AltosFlightInfoTableModel;
+
+public class AltosStatusTable extends JTable {
+       private AltosFlightStatusTableModel flightStatusModel;
+
+       JFrame  frame;
+
+       private Font statusFont = new Font("SansSerif", Font.BOLD, 24);
+
+       public AltosStatusTable(JFrame in_frame) {
+               super((TableModel) new AltosFlightStatusTableModel());
+               flightStatusModel = (AltosFlightStatusTableModel) getModel();
+               frame = in_frame;
+
+               setFont(statusFont);
+
+               TableColumnModel tcm = getColumnModel();
+
+               for (int i = 0; i < flightStatusModel.getColumnCount(); i++) {
+                       DefaultTableCellRenderer       r = new DefaultTableCellRenderer();
+                       r.setFont(statusFont);
+                       r.setHorizontalAlignment(SwingConstants.CENTER);
+                       tcm.getColumn(i).setCellRenderer(r);
+               }
+
+               setRowHeight(rowHeight());
+               setShowGrid(false);
+       }
+
+       public int rowHeight() {
+               FontMetrics     statusMetrics = getFontMetrics(statusFont);
+               return (statusMetrics.getHeight() + statusMetrics.getLeading()) * 15 / 10;
+       }
+
+       public int height() {
+               return rowHeight * 4;
+       }
+
+       public void set(AltosState state) {
+               flightStatusModel.set(state);
+       }
+}
index ad02f2ef990149ae21325a99699418fe84cf2745..e130de58d703470f61845d3852ccc9b89389370b 100644 (file)
@@ -38,31 +38,25 @@ import altosui.AltosDeviceDialog;
 import altosui.AltosPreferences;
 import altosui.AltosLog;
 import altosui.AltosVoice;
-import altosui.AltosFlightStatusTableModel;
 import altosui.AltosFlightInfoTableModel;
 import altosui.AltosChannelMenu;
 import altosui.AltosFlashUI;
 import altosui.AltosLogfileChooser;
 import altosui.AltosCSVUI;
 import altosui.AltosLine;
+import altosui.AltosStatusTable;
+import altosui.AltosInfoTable;
 
 import libaltosJNI.*;
 
 public class AltosUI extends JFrame {
        private int channel = -1;
 
-       private AltosFlightStatusTableModel flightStatusModel;
-       private JTable flightStatus;
-
-       static final int info_columns = 3;
-
-       private AltosFlightInfoTableModel[] flightInfoModel;
-       private JTable[] flightInfo;
+       private AltosStatusTable flightStatus;
+       private AltosInfoTable flightInfo;
        private AltosSerial serial_line;
        private AltosLog altos_log;
-       private Box[] ibox;
        private Box vbox;
-       private Box hbox;
 
        private Font statusFont = new Font("SansSerif", Font.BOLD, 24);
        private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 14);
@@ -98,44 +92,12 @@ public class AltosUI extends JFrame {
                vbox = Box.createVerticalBox();
                this.add(vbox);
 
-               flightStatusModel = new AltosFlightStatusTableModel();
-               flightStatus = new JTable(flightStatusModel);
-               flightStatus.setFont(statusFont);
-               TableColumnModel tcm = flightStatus.getColumnModel();
-               for (int i = 0; i < flightStatusModel.getColumnCount(); i++) {
-                       DefaultTableCellRenderer       r = new DefaultTableCellRenderer();
-                       r.setFont(statusFont);
-                       r.setHorizontalAlignment(SwingConstants.CENTER);
-                       tcm.getColumn(i).setCellRenderer(r);
-               }
-
-               FontMetrics     statusMetrics = flightStatus.getFontMetrics(statusFont);
-               int statusHeight = (statusMetrics.getHeight() + statusMetrics.getLeading()) * 15 / 10;
-               flightStatus.setRowHeight(statusHeight);
-               flightStatus.setShowGrid(false);
+               flightStatus = new AltosStatusTable(this);
 
                vbox.add(flightStatus);
 
-               hbox = Box.createHorizontalBox();
-               vbox.add(hbox);
-
-               flightInfo = new JTable[3];
-               flightInfoModel = new AltosFlightInfoTableModel[3];
-               ibox = new Box[3];
-               FontMetrics     infoValueMetrics = flightStatus.getFontMetrics(infoValueFont);
-               int infoHeight = (infoValueMetrics.getHeight() + infoValueMetrics.getLeading()) * 20 / 10;
-
-               for (int i = 0; i < info_columns; i++) {
-                       ibox[i] = Box.createVerticalBox();
-                       flightInfoModel[i] = new AltosFlightInfoTableModel();
-                       flightInfo[i] = new JTable(flightInfoModel[i]);
-                       flightInfo[i].setFont(infoValueFont);
-                       flightInfo[i].setRowHeight(infoHeight);
-                       flightInfo[i].setShowGrid(true);
-                       ibox[i].add(flightInfo[i].getTableHeader());
-                       ibox[i].add(flightInfo[i]);
-                       hbox.add(ibox[i]);
-               }
+               flightInfo = new AltosInfoTable();
+               vbox.add(flightInfo.box());
 
                setTitle("AltOS");
 
@@ -144,8 +106,8 @@ public class AltosUI extends JFrame {
                serial_line = new AltosSerial();
                altos_log = new AltosLog(serial_line);
                int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
-               this.setSize(new Dimension (infoValueMetrics.charWidth('0') * 6 * 20,
-                                           statusHeight * 4 + infoHeight * 17));
+               this.setSize(new Dimension (flightInfo.width(),
+                                           flightStatus.height() + flightInfo.height()));
                this.validate();
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
                addWindowListener(new WindowAdapter() {
@@ -157,136 +119,11 @@ public class AltosUI extends JFrame {
                voice.speak("Rocket flight monitor ready.");
        }
 
-       public void info_reset() {
-               for (int i = 0; i < info_columns; i++)
-                       flightInfoModel[i].resetRow();
-       }
-
-       public void info_add_row(int col, String name, String value) {
-               flightInfoModel[col].addRow(name, value);
-       }
-
-       public void info_add_row(int col, String name, String format, Object... parameters) {
-               flightInfoModel[col].addRow(name, String.format(format, parameters));
-       }
-
-       public void info_add_deg(int col, String name, double v, int pos, int neg) {
-               int     c = pos;
-               if (v < 0) {
-                       c = neg;
-                       v = -v;
+       void show(AltosState state, int crc_errors) {
+               if (state != null) {
+                       flightStatus.set(state);
+                       flightInfo.show(state, crc_errors);
                }
-               double  deg = Math.floor(v);
-               double  min = (v - deg) * 60;
-
-               flightInfoModel[col].addRow(name, String.format("%3.0f°%08.5f'", deg, min));
-       }
-
-       public void info_finish() {
-               for (int i = 0; i < info_columns; i++)
-                       flightInfoModel[i].finish();
-       }
-
-       public void show(AltosState state, int crc_errors) {
-               if (state == null)
-                       return;
-               flightStatusModel.set(state);
-
-               info_reset();
-               info_add_row(0, "Rocket state", "%s", state.data.state());
-               info_add_row(0, "Callsign", "%s", state.data.callsign);
-               info_add_row(0, "Rocket serial", "%6d", state.data.serial);
-               info_add_row(0, "Rocket flight", "%6d", state.data.flight);
-
-               info_add_row(0, "RSSI", "%6d    dBm", state.data.rssi);
-               info_add_row(0, "CRC Errors", "%6d", crc_errors);
-               info_add_row(0, "Height", "%6.0f    m", state.height);
-               info_add_row(0, "Max height", "%6.0f    m", state.max_height);
-               info_add_row(0, "Acceleration", "%8.1f  m/s²", state.acceleration);
-               info_add_row(0, "Max acceleration", "%8.1f  m/s²", state.max_acceleration);
-               info_add_row(0, "Speed", "%8.1f  m/s", state.ascent ? state.speed : state.baro_speed);
-               info_add_row(0, "Max Speed", "%8.1f  m/s", state.max_speed);
-               info_add_row(0, "Temperature", "%9.2f °C", state.temperature);
-               info_add_row(0, "Battery", "%9.2f V", state.battery);
-               info_add_row(0, "Drogue", "%9.2f V", state.drogue_sense);
-               info_add_row(0, "Main", "%9.2f V", state.main_sense);
-               info_add_row(0, "Pad altitude", "%6.0f    m", state.ground_altitude);
-               if (state.gps == null) {
-                       info_add_row(1, "GPS", "not available");
-               } else {
-                       if (state.gps_ready)
-                               info_add_row(1, "GPS state", "%s", "ready");
-                       else
-                               info_add_row(1, "GPS state", "wait (%d)",
-                                            state.gps_waiting);
-                       if (state.data.gps.locked)
-                               info_add_row(1, "GPS", "   locked");
-                       else if (state.data.gps.connected)
-                               info_add_row(1, "GPS", " unlocked");
-                       else
-                               info_add_row(1, "GPS", "  missing");
-                       info_add_row(1, "Satellites", "%6d", state.data.gps.nsat);
-                       info_add_deg(1, "Latitude", state.gps.lat, 'N', 'S');
-                       info_add_deg(1, "Longitude", state.gps.lon, 'E', 'W');
-                       info_add_row(1, "GPS altitude", "%6d", state.gps.alt);
-                       info_add_row(1, "GPS height", "%6.0f", state.gps_height);
-
-                       /* The SkyTraq GPS doesn't report these values */
-                       if (false) {
-                               info_add_row(1, "GPS ground speed", "%8.1f m/s %3d°",
-                                            state.gps.ground_speed,
-                                            state.gps.course);
-                               info_add_row(1, "GPS climb rate", "%8.1f m/s",
-                                            state.gps.climb_rate);
-                               info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
-                                            state.gps.h_error, state.gps.v_error);
-                       }
-                       info_add_row(1, "GPS hdop", "%8.1f", state.gps.hdop);
-
-                       if (state.npad > 0) {
-                               if (state.from_pad != null) {
-                                       info_add_row(1, "Distance from pad", "%6d m",
-                                                    (int) (state.from_pad.distance + 0.5));
-                                       info_add_row(1, "Direction from pad", "%6d°",
-                                                    (int) (state.from_pad.bearing + 0.5));
-                                       info_add_row(1, "Elevation from pad", "%6d°",
-                                                    (int) (state.elevation + 0.5));
-                                       info_add_row(1, "Range from pad", "%6d m",
-                                                    (int) (state.range + 0.5));
-                               } else {
-                                       info_add_row(1, "Distance from pad", "unknown");
-                                       info_add_row(1, "Direction from pad", "unknown");
-                                       info_add_row(1, "Elevation from pad", "unknown");
-                                       info_add_row(1, "Range from pad", "unknown");
-                               }
-                               info_add_deg(1, "Pad latitude", state.pad_lat, 'N', 'S');
-                               info_add_deg(1, "Pad longitude", state.pad_lon, 'E', 'W');
-                               info_add_row(1, "Pad GPS alt", "%6.0f m", state.pad_alt);
-                       }
-                       info_add_row(1, "GPS date", "%04d-%02d-%02d",
-                                      state.gps.year,
-                                      state.gps.month,
-                                      state.gps.day);
-                       info_add_row(1, "GPS time", "  %02d:%02d:%02d",
-                                      state.gps.hour,
-                                      state.gps.minute,
-                                      state.gps.second);
-                       int     nsat_vis = 0;
-                       int     c;
-
-                       if (state.gps.cc_gps_sat == null)
-                               info_add_row(2, "Satellites Visible", "%4d", 0);
-                       else {
-                               info_add_row(2, "Satellites Visible", "%4d", state.gps.cc_gps_sat.length);
-                               for (c = 0; c < state.gps.cc_gps_sat.length; c++) {
-                                       info_add_row(2, "Satellite id,C/N0",
-                                                    "%4d, %4d",
-                                                    state.gps.cc_gps_sat[c].svid,
-                                                    state.gps.cc_gps_sat[c].c_n0);
-                               }
-                       }
-               }
-               info_finish();
        }
 
        class IdleThread extends Thread {
@@ -455,8 +292,7 @@ public class AltosUI extends JFrame {
 
                        idle_thread = new IdleThread();
 
-                       info_reset();
-                       info_finish();
+                       flightInfo.clear();
                        try {
                                for (;;) {
                                        try {
@@ -609,19 +445,6 @@ public class AltosUI extends JFrame {
                }
        }
 
-       class ReplayTelemetryThread extends ReplayThread {
-               ReplayTelemetryThread(FileInputStream in, String in_name) {
-                       super(new AltosTelemetryReader(in), in_name);
-               }
-
-       }
-
-       class ReplayEepromThread extends ReplayThread {
-               ReplayEepromThread(FileInputStream in, String in_name) {
-                       super(new AltosEepromReader(in), in_name);
-               }
-       }
-
        Thread          display_thread;
 
        private void stop_display() {
index 90621f367c496c76ffba4c517ef54934caab63a1..a95a5aa889952dcfae12ccddf98f4c563f790651 100644 (file)
@@ -24,6 +24,7 @@ CLASSFILES=\
        AltosGreatCircle.class \
        AltosHexfile.class \
        AltosLine.class \
+       AltosInfoTable.class \
        AltosLog.class \
        AltosLogfileChooser.class \
        AltosParse.class \
@@ -33,6 +34,7 @@ CLASSFILES=\
        AltosSerialMonitor.class \
        AltosSerial.class \
        AltosState.class \
+       AltosStatusTable.class \
        AltosTelemetry.class \
        AltosTelemetryReader.class \
        AltosUI.class \
index 0a91f939db0a51fe6f4828c5dfa23473e069ab98..35a1b99035665f21d3de454270a89cb5f8f7ebd1 100644 (file)
@@ -33,6 +33,7 @@ altosui_JAVA = \
        AltosGreatCircle.java \
        AltosHexfile.java \
        Altos.java \
+       AltosInfoTable.java \
        AltosLine.java \
        AltosLogfileChooser.java \
        AltosLog.java \
@@ -45,6 +46,7 @@ altosui_JAVA = \
        AltosSerial.java \
        AltosSerialMonitor.java \
        AltosState.java \
+       AltosStatusTable.java \
        AltosTelemetry.java \
        AltosTelemetryReader.java \
        AltosUI.java \
@@ -111,8 +113,6 @@ clean-local:
                $(JFREECHART_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
                altosui altosui-test macosx linux
 
-fat: $(FATJAR) $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
-
 if FATINSTALL
 
 FATTARGET=$(FATDIR)/$(VERSION)
@@ -135,8 +135,11 @@ $(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
        mkdir -p $(FATTARGET)
        cp -p $< $@
 
+else
+fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
 endif
 
+
 altosuidir=$(datadir)/java
 
 install-altosuiJAVA: altosui.jar