telegps: Add info table
authorKeith Packard <keithp@keithp.com>
Thu, 29 May 2014 17:16:15 +0000 (10:16 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 29 May 2014 17:16:15 +0000 (10:16 -0700)
Move a couple of files from altosui to altosuilib, hook up the info
table after changing it to implement the AltosFlightDisplay interface

Signed-off-by: Keith Packard <keithp@keithp.com>
altoslib/AltosState.java
altosui/AltosCompanionInfo.java
altosui/AltosFlightInfoTableModel.java [deleted file]
altosui/AltosIdleMonitorUI.java
altosui/AltosInfoTable.java [deleted file]
altosui/Makefile.am
altosuilib/AltosFlightInfoTableModel.java [new file with mode: 0644]
altosuilib/AltosInfoTable.java [new file with mode: 0644]
altosuilib/Makefile.am
telegps/TeleGPS.java
telegps/TeleGPSInfo.java

index 1162e52..ddda82b 100644 (file)
@@ -713,6 +713,7 @@ public class AltosState implements Cloneable {
                gps_ground_altitude = new AltosGpsGroundAltitude();
                gps_ground_speed = new AltosValue();
                gps_ascent_rate = new AltosValue();
+               gps_course = new AltosValue();
 
                speak_tick = AltosLib.MISSING;
                speak_altitude = AltosLib.MISSING;
@@ -842,6 +843,9 @@ public class AltosState implements Cloneable {
 
                gps_altitude.copy(old.gps_altitude);
                gps_ground_altitude.copy(old.gps_ground_altitude);
+               gps_ground_speed.copy(old.gps_ground_speed);
+               gps_ascent_rate.copy(old.gps_ascent_rate);
+               gps_course.copy(old.gps_course);
 
                pad_lat = old.pad_lat;
                pad_lon = old.pad_lon;
index 42413a5..f8d033a 100644 (file)
@@ -20,8 +20,9 @@ package altosui;
 import java.awt.*;
 import javax.swing.*;
 import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
-public class AltosCompanionInfo extends JTable {
+public class AltosCompanionInfo extends JTable implements AltosFlightDisplay {
        private AltosFlightInfoTableModel model;
 
        static final int info_columns = 2;
@@ -50,7 +51,7 @@ public class AltosCompanionInfo extends JTable {
                return getPreferredSize();
        }
 
-       void info_reset() {
+       public void reset() {
                model.reset();
        }
 
@@ -88,7 +89,7 @@ public class AltosCompanionInfo extends JTable {
                        return;
                if (state.companion != null)
                        companion = state.companion;
-               info_reset();
+               reset();
                info_add_row(0, "Companion board", "%s", board_name());
                if (companion != null) {
                        info_add_row(0, "Last Data", "%5d", companion.tick);
diff --git a/altosui/AltosFlightInfoTableModel.java b/altosui/AltosFlightInfoTableModel.java
deleted file mode 100644 (file)
index 249f649..0000000
+++ /dev/null
@@ -1,75 +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; 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 javax.swing.table.*;
-
-public class AltosFlightInfoTableModel extends AbstractTableModel {
-       final static private String[] columnNames = {"Field", "Value"};
-
-       int     rows;
-       int     cols;
-       private String[][] data;
-
-       public int getColumnCount() { return cols; }
-       public int getRowCount() { return rows; }
-       public String getColumnName(int col) { return columnNames[col & 1]; }
-
-       public Object getValueAt(int row, int col) {
-               if (row >= rows || col >= cols)
-                       return "";
-               return data[row][col];
-       }
-
-       int[]   current_row;
-
-       public void reset() {
-               for (int i = 0; i < cols / 2; i++)
-                       current_row[i] = 0;
-       }
-
-       public void clear() {
-               reset();
-               for (int c = 0; c < cols; c++)
-                       for (int r = 0; r < rows; r++)
-                               data[r][c] = "";
-               fireTableDataChanged();
-       }
-
-       public void addRow(int col, String name, String value) {
-               if (current_row[col] < rows) {
-                       data[current_row[col]][col * 2] = name;
-                       data[current_row[col]][col * 2 + 1] = value;
-               }
-               current_row[col]++;
-       }
-
-       public void finish() {
-               for (int c = 0; c < cols / 2; c++)
-                       while (current_row[c] < rows)
-                               addRow(c, "", "");
-               fireTableDataChanged();
-       }
-
-       public AltosFlightInfoTableModel (int in_rows, int in_cols) {
-               rows = in_rows;
-               cols = in_cols * 2;
-               data = new String[rows][cols];
-               current_row = new int[in_cols];
-       }
-}
index 62b5056..b5652df 100644 (file)
@@ -234,7 +234,9 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
                                        try {
                                                disconnect();
                                        } catch (Exception ex) {
-                                               System.out.println(Arrays.toString(ex.getStackTrace()));
+                                               System.out.printf("Exception %s\n", ex.toString());
+                                               for (StackTraceElement e : ex.getStackTrace())
+                                                       System.out.printf("%s\n", e.toString());
                                        }
                                        setVisible(false);
                                        dispose();
diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java
deleted file mode 100644 (file)
index 125fa94..0000000
+++ /dev/null
@@ -1,236 +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; 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 javax.swing.*;
-import javax.swing.table.*;
-import org.altusmetrum.altoslib_4.*;
-
-public class AltosInfoTable extends JTable {
-       private AltosFlightInfoTableModel model;
-
-       static final int info_columns = 3;
-       static final int info_rows = 17;
-
-       int desired_row_height() {
-               FontMetrics     infoValueMetrics = getFontMetrics(Altos.table_value_font);
-               return (infoValueMetrics.getHeight() + infoValueMetrics.getLeading()) * 18 / 10;
-       }
-
-       int text_width(String t) {
-               FontMetrics     infoValueMetrics = getFontMetrics(Altos.table_value_font);
-
-               return infoValueMetrics.stringWidth(t);
-       }
-
-       void set_layout() {
-               setRowHeight(desired_row_height());
-               for (int i = 0; i < info_columns * 2; i++)
-               {
-                       TableColumn column = getColumnModel().getColumn(i);
-
-                       if ((i & 1) == 0)
-                               column.setPreferredWidth(text_width(" Satellites Visible"));
-                       else
-                               column.setPreferredWidth(text_width("W 179°59.99999' "));
-               }
-       }
-
-       public AltosInfoTable() {
-               super(new AltosFlightInfoTableModel(info_rows, info_columns));
-               model = (AltosFlightInfoTableModel) getModel();
-               setFont(Altos.table_value_font);
-               setAutoResizeMode(AUTO_RESIZE_ALL_COLUMNS);
-               setShowGrid(true);
-               set_layout();
-               doLayout();
-       }
-
-       public void set_font() {
-               setFont(Altos.table_value_font);
-               set_layout();
-               doLayout();
-       }
-
-       public Dimension getPreferredScrollableViewportSize() {
-               return getPreferredSize();
-       }
-
-       void info_reset() {
-               model.reset();
-       }
-
-       void info_add_row(int col, String name, String value) {
-               model.addRow(col, name, value);
-       }
-
-       void info_add_row(int col, String name, String format, Object... parameters) {
-               info_add_row (col, 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;
-
-               info_add_row(col, name, String.format("%c %3.0f°%08.5f'", c, deg, min));
-       }
-
-       void info_finish() {
-               model.finish();
-       }
-
-       public void clear() {
-               model.clear();
-       }
-
-       public void show(AltosState state, AltosListenerState listener_state) {
-               info_reset();
-               if (state != null) {
-                       if (state.device_type != AltosLib.MISSING)
-                               info_add_row(0, "Device", "%s", AltosLib.product_name(state.device_type));
-                       if (state.altitude() != AltosLib.MISSING)
-                               info_add_row(0, "Altitude", "%6.0f    m", state.altitude());
-                       if (state.ground_altitude() != AltosLib.MISSING)
-                               info_add_row(0, "Pad altitude", "%6.0f    m", state.ground_altitude());
-                       if (state.height() != AltosLib.MISSING)
-                               info_add_row(0, "Height", "%6.0f    m", state.height());
-                       if (state.max_height() != AltosLib.MISSING)
-                               info_add_row(0, "Max height", "%6.0f    m", state.max_height());
-                       if (state.acceleration() != AltosLib.MISSING)
-                               info_add_row(0, "Acceleration", "%8.1f  m/s²", state.acceleration());
-                       if (state.max_acceleration() != AltosLib.MISSING)
-                               info_add_row(0, "Max acceleration", "%8.1f  m/s²", state.max_acceleration());
-                       if (state.speed() != AltosLib.MISSING)
-                               info_add_row(0, "Speed", "%8.1f  m/s", state.speed());
-                       if (state.max_speed() != AltosLib.MISSING)
-                               info_add_row(0, "Max Speed", "%8.1f  m/s", state.max_speed());
-                       if (state.orient() != AltosLib.MISSING)
-                               info_add_row(0, "Tilt", "%4.0f °", state.orient());
-                       if (state.max_orient() != AltosLib.MISSING)
-                               info_add_row(0, "Max Tilt", "%4.0f °", state.max_orient());
-                       if (state.temperature != AltosLib.MISSING)
-                               info_add_row(0, "Temperature", "%9.2f °C", state.temperature);
-                       if (state.battery_voltage != AltosLib.MISSING)
-                               info_add_row(0, "Battery", "%9.2f V", state.battery_voltage);
-                       if (state.apogee_voltage != AltosLib.MISSING)
-                               info_add_row(0, "Drogue", "%9.2f V", state.apogee_voltage);
-                       if (state.main_voltage != AltosLib.MISSING)
-                               info_add_row(0, "Main", "%9.2f V", state.main_voltage);
-               }
-               if (listener_state != null) {
-                       info_add_row(0, "CRC Errors", "%6d", listener_state.crc_errors);
-
-                       if (listener_state.battery != AltosLib.MISSING)
-                               info_add_row(0, "Receiver Battery", "%9.2f", listener_state.battery);
-               }
-
-               if (state != null) {
-                       if (state.gps == null || !state.gps.connected) {
-                               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.gps.locked)
-                                       info_add_row(1, "GPS", "   locked");
-                               else if (state.gps.connected)
-                                       info_add_row(1, "GPS", " unlocked");
-                               else
-                                       info_add_row(1, "GPS", "  missing");
-                               info_add_row(1, "Satellites", "%6d", state.gps.nsat);
-                               if (state.gps.lat != AltosLib.MISSING)
-                                       info_add_deg(1, "Latitude", state.gps.lat, 'N', 'S');
-                               if (state.gps.lon != AltosLib.MISSING)
-                                       info_add_deg(1, "Longitude", state.gps.lon, 'E', 'W');
-                               if (state.gps.alt != AltosLib.MISSING)
-                                       info_add_row(1, "GPS altitude", "%8.1f", state.gps.alt);
-                               if (state.gps_height != AltosLib.MISSING)
-                                       info_add_row(1, "GPS height", "%8.1f", 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);
-                               }
-                               if (state.gps.year != AltosLib.MISSING)
-                                       info_add_row(1, "GPS date", "%04d-%02d-%02d",
-                                                    state.gps.year,
-                                                    state.gps.month,
-                                                    state.gps.day);
-                               if (state.gps.hour != AltosLib.MISSING)
-                                       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 686b596..add4682 100644 (file)
@@ -21,7 +21,6 @@ altosui_JAVA = \
        AltosConfigTD.java \
        AltosConfigTDUI.java \
        AltosDescent.java \
-       AltosFlightInfoTableModel.java \
        AltosFlightStatsTable.java \
        AltosFlightStatus.java \
        AltosFlightStatusUpdate.java \
@@ -32,7 +31,6 @@ altosui_JAVA = \
        AltosIgnitor.java \
        AltosLaunch.java \
        AltosLaunchUI.java \
-       AltosInfoTable.java \
        AltosLanded.java \
        AltosPad.java \
        AltosUIPreferencesBackend.java \
diff --git a/altosuilib/AltosFlightInfoTableModel.java b/altosuilib/AltosFlightInfoTableModel.java
new file mode 100644 (file)
index 0000000..3995efb
--- /dev/null
@@ -0,0 +1,75 @@
+/*
+ * 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 org.altusmetrum.altosuilib_2;
+
+import javax.swing.table.*;
+
+public class AltosFlightInfoTableModel extends AbstractTableModel {
+       final static private String[] columnNames = {"Field", "Value"};
+
+       int     rows;
+       int     cols;
+       private String[][] data;
+
+       public int getColumnCount() { return cols; }
+       public int getRowCount() { return rows; }
+       public String getColumnName(int col) { return columnNames[col & 1]; }
+
+       public Object getValueAt(int row, int col) {
+               if (row >= rows || col >= cols)
+                       return "";
+               return data[row][col];
+       }
+
+       int[]   current_row;
+
+       public void reset() {
+               for (int i = 0; i < cols / 2; i++)
+                       current_row[i] = 0;
+       }
+
+       public void clear() {
+               reset();
+               for (int c = 0; c < cols; c++)
+                       for (int r = 0; r < rows; r++)
+                               data[r][c] = "";
+               fireTableDataChanged();
+       }
+
+       public void addRow(int col, String name, String value) {
+               if (current_row[col] < rows) {
+                       data[current_row[col]][col * 2] = name;
+                       data[current_row[col]][col * 2 + 1] = value;
+               }
+               current_row[col]++;
+       }
+
+       public void finish() {
+               for (int c = 0; c < cols / 2; c++)
+                       while (current_row[c] < rows)
+                               addRow(c, "", "");
+               fireTableDataChanged();
+       }
+
+       public AltosFlightInfoTableModel (int in_rows, int in_cols) {
+               rows = in_rows;
+               cols = in_cols * 2;
+               data = new String[rows][cols];
+               current_row = new int[in_cols];
+       }
+}
diff --git a/altosuilib/AltosInfoTable.java b/altosuilib/AltosInfoTable.java
new file mode 100644 (file)
index 0000000..0d8779d
--- /dev/null
@@ -0,0 +1,236 @@
+/*
+ * 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 org.altusmetrum.altosuilib_2;
+
+import java.awt.*;
+import javax.swing.*;
+import javax.swing.table.*;
+import org.altusmetrum.altoslib_4.*;
+
+public class AltosInfoTable extends JTable implements AltosFlightDisplay {
+       private AltosFlightInfoTableModel model;
+
+       static final int info_columns = 3;
+       static final int info_rows = 17;
+
+       int desired_row_height() {
+               FontMetrics     infoValueMetrics = getFontMetrics(AltosUILib.table_value_font);
+               return (infoValueMetrics.getHeight() + infoValueMetrics.getLeading()) * 18 / 10;
+       }
+
+       int text_width(String t) {
+               FontMetrics     infoValueMetrics = getFontMetrics(AltosUILib.table_value_font);
+
+               return infoValueMetrics.stringWidth(t);
+       }
+
+       void set_layout() {
+               setRowHeight(desired_row_height());
+               for (int i = 0; i < info_columns * 2; i++)
+               {
+                       TableColumn column = getColumnModel().getColumn(i);
+
+                       if ((i & 1) == 0)
+                               column.setPreferredWidth(text_width(" Satellites Visible"));
+                       else
+                               column.setPreferredWidth(text_width("W 179°59.99999' "));
+               }
+       }
+
+       public AltosInfoTable() {
+               super(new AltosFlightInfoTableModel(info_rows, info_columns));
+               model = (AltosFlightInfoTableModel) getModel();
+               setFont(AltosUILib.table_value_font);
+               setAutoResizeMode(AUTO_RESIZE_ALL_COLUMNS);
+               setShowGrid(true);
+               set_layout();
+               doLayout();
+       }
+
+       public void set_font() {
+               setFont(AltosUILib.table_value_font);
+               set_layout();
+               doLayout();
+       }
+
+       public Dimension getPreferredScrollableViewportSize() {
+               return getPreferredSize();
+       }
+
+       public void reset() {
+               model.reset();
+       }
+
+       void info_add_row(int col, String name, String value) {
+               model.addRow(col, name, value);
+       }
+
+       void info_add_row(int col, String name, String format, Object... parameters) {
+               info_add_row (col, 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;
+
+               info_add_row(col, name, String.format("%c %3.0f°%08.5f'", c, deg, min));
+       }
+
+       void info_finish() {
+               model.finish();
+       }
+
+       public void clear() {
+               model.clear();
+       }
+
+       public void show(AltosState state, AltosListenerState listener_state) {
+               reset();
+               if (state != null) {
+                       if (state.device_type != AltosLib.MISSING)
+                               info_add_row(0, "Device", "%s", AltosLib.product_name(state.device_type));
+                       if (state.altitude() != AltosLib.MISSING)
+                               info_add_row(0, "Altitude", "%6.0f    m", state.altitude());
+                       if (state.ground_altitude() != AltosLib.MISSING)
+                               info_add_row(0, "Pad altitude", "%6.0f    m", state.ground_altitude());
+                       if (state.height() != AltosLib.MISSING)
+                               info_add_row(0, "Height", "%6.0f    m", state.height());
+                       if (state.max_height() != AltosLib.MISSING)
+                               info_add_row(0, "Max height", "%6.0f    m", state.max_height());
+                       if (state.acceleration() != AltosLib.MISSING)
+                               info_add_row(0, "Acceleration", "%8.1f  m/s²", state.acceleration());
+                       if (state.max_acceleration() != AltosLib.MISSING)
+                               info_add_row(0, "Max acceleration", "%8.1f  m/s²", state.max_acceleration());
+                       if (state.speed() != AltosLib.MISSING)
+                               info_add_row(0, "Speed", "%8.1f  m/s", state.speed());
+                       if (state.max_speed() != AltosLib.MISSING)
+                               info_add_row(0, "Max Speed", "%8.1f  m/s", state.max_speed());
+                       if (state.orient() != AltosLib.MISSING)
+                               info_add_row(0, "Tilt", "%4.0f °", state.orient());
+                       if (state.max_orient() != AltosLib.MISSING)
+                               info_add_row(0, "Max Tilt", "%4.0f °", state.max_orient());
+                       if (state.temperature != AltosLib.MISSING)
+                               info_add_row(0, "Temperature", "%9.2f °C", state.temperature);
+                       if (state.battery_voltage != AltosLib.MISSING)
+                               info_add_row(0, "Battery", "%9.2f V", state.battery_voltage);
+                       if (state.apogee_voltage != AltosLib.MISSING)
+                               info_add_row(0, "Drogue", "%9.2f V", state.apogee_voltage);
+                       if (state.main_voltage != AltosLib.MISSING)
+                               info_add_row(0, "Main", "%9.2f V", state.main_voltage);
+               }
+               if (listener_state != null) {
+                       info_add_row(0, "CRC Errors", "%6d", listener_state.crc_errors);
+
+                       if (listener_state.battery != AltosLib.MISSING)
+                               info_add_row(0, "Receiver Battery", "%9.2f", listener_state.battery);
+               }
+
+               if (state != null) {
+                       if (state.gps == null || !state.gps.connected) {
+                               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.gps.locked)
+                                       info_add_row(1, "GPS", "   locked");
+                               else if (state.gps.connected)
+                                       info_add_row(1, "GPS", " unlocked");
+                               else
+                                       info_add_row(1, "GPS", "  missing");
+                               info_add_row(1, "Satellites", "%6d", state.gps.nsat);
+                               if (state.gps.lat != AltosLib.MISSING)
+                                       info_add_deg(1, "Latitude", state.gps.lat, 'N', 'S');
+                               if (state.gps.lon != AltosLib.MISSING)
+                                       info_add_deg(1, "Longitude", state.gps.lon, 'E', 'W');
+                               if (state.gps.alt != AltosLib.MISSING)
+                                       info_add_row(1, "GPS altitude", "%8.1f", state.gps.alt);
+                               if (state.gps_height != AltosLib.MISSING)
+                                       info_add_row(1, "GPS height", "%8.1f", 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);
+                               }
+                               if (state.gps.year != AltosLib.MISSING)
+                                       info_add_row(1, "GPS date", "%04d-%02d-%02d",
+                                                    state.gps.year,
+                                                    state.gps.month,
+                                                    state.gps.day);
+                               if (state.gps.hour != AltosLib.MISSING)
+                                       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 e697b17..65a8228 100644 (file)
@@ -56,6 +56,8 @@ altosuilib_JAVA = \
        AltosLed.java \
        AltosFlashUI.java \
        AltosRomconfigUI.java \
+       AltosInfoTable.java \
+       AltosFlightInfoTableModel.java \
        AltosBTDevice.java \
        AltosBTDeviceIterator.java \
        AltosBTManage.java \
index 7f34c76..d30d8dc 100644 (file)
@@ -50,16 +50,25 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
        AltosFlightReader       reader;
        AltosDisplayThread      thread;
 
-       JTabbedPane     pane;
+       JMenuBar                menu_bar;
 
-       AltosSiteMap    sitemap;
-       TeleGPSInfo     gps_info;
-       boolean         has_map;
+       JMenu                   file_menu;
+       JMenu                   monitor_menu;
+       JMenu                   device_menu;
+       AltosFreqList           frequencies;
+
+       Container               bag;
+
+       TeleGPSStatus           telegps_status;
+       TeleGPSStatusUpdate     status_update;
+
+       JTabbedPane             pane;
+
+       AltosSiteMap            sitemap;
+       TeleGPSInfo             gps_info;
+       AltosInfoTable          info_table;
 
-       JMenuBar        menu_bar;
-       JMenu           file_menu;
-       JMenu           monitor_menu;
-       JMenu           device_menu;
+       LinkedList<AltosFlightDisplay>  displays;
 
        /* File menu */
        final static String     new_command = "new";
@@ -113,41 +122,38 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
        }
 
        public void reset() {
-               sitemap.reset();
-               gps_info.reset();
+               for (AltosFlightDisplay display : displays)
+                       display.reset();
        }
 
        public void set_font() {
-               sitemap.set_font();
-               gps_info.set_font();
+               for (AltosFlightDisplay display : displays)
+                       display.set_font();
        }
 
        public void font_size_changed(int font_size) {
                set_font();
        }
 
-
-//     AltosFlightStatusUpdate status_update;
-
        public void show(AltosState state, AltosListenerState listener_state) {
-//             status_update.saved_state = state;
+               try {
+                       status_update.saved_state = state;
 
-               if (state == null)
-                       state = new AltosState();
+                       if (state == null)
+                               state = new AltosState();
 
-               sitemap.show(state, listener_state);
-               gps_info.show(state, listener_state);
-               telegps_status.show(state, listener_state);
+                       int i = 0;
+                       for (AltosFlightDisplay display : displays) {
+                               display.show(state, listener_state);
+                               i++;
+                       }
+               } catch (Exception ex) {
+                       System.out.printf("Exception %s\n", ex.toString());
+                       for (StackTraceElement e : ex.getStackTrace())
+                               System.out.printf("%s\n", e.toString());
+               }
        }
 
-       Container               bag;
-       AltosFreqList           frequencies;
-       JLabel                  telemetry;
-       TeleGPSStatus           telegps_status;
-       TeleGPSStatusUpdate     status_update;
-
-       ActionListener          show_timer;
-
        void new_window() {
                new TeleGPS();
        }
@@ -379,6 +385,7 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
                file_menu = make_menu("File", file_menu_entries);
                monitor_menu = make_menu("Monitor", monitor_menu_entries);
                device_menu = make_menu("Device", device_menu_entries);
+               displays = new LinkedList<AltosFlightDisplay>();
 
                int serial = -1;
 
@@ -391,6 +398,7 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
                c.gridwidth = 2;
                bag.add(telegps_status, c);
                c.gridwidth = 1;
+               displays.add(telegps_status);
 
 
                /* The rest of the window uses a tabbed pane to
@@ -409,9 +417,15 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
 
                sitemap = new AltosSiteMap();
                pane.add("Site Map", sitemap);
+               displays.add(sitemap);
 
                gps_info = new TeleGPSInfo();
                pane.add("Info", gps_info);
+               displays.add(gps_info);
+
+               info_table = new AltosInfoTable();
+               pane.add("Table", info_table);
+               displays.add(info_table);
 
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
index 0fba77d..da3df44 100644 (file)
@@ -58,6 +58,10 @@ public class TeleGPSInfo extends JComponent implements AltosFlightDisplay {
                        show(String.format(format, v));
                }
 
+               void show(String format, int v) {
+                       show(String.format(format, v));
+               }
+
                void reset() {
                        lights.set(false);
                        value.setText("");