altoslib, altosuilib: Get Idle Monitor working with EasyTimer and EasyMotor

[fw/altos] / altosuilib / AltosInfoTable.java

diff --git a/altosuilib/AltosInfoTable.java b/altosuilib/AltosInfoTable.java
index 72d4fb56275e423b1bb16a23c8ddf7b5f6840c3a..89d453030ddb3bcfd44f86e050e1577261bffaa2 100644 (file)
--- a/altosuilib/AltosInfoTable.java
+++ b/altosuilib/AltosInfoTable.java
@@ -16,13 +16,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_13;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.table.*;
-import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altoslib_14.*;
 
 public class AltosInfoTable extends JTable implements AltosFlightDisplay, HierarchyListener {
        private AltosFlightInfoTableModel model;
@@ -242,7 +242,7 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar
                                        }
                                        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, "Pad GPS alt", "%6.0f m", state.gps_ground_altitude());
                                }
                                if (state.gps.year != AltosLib.MISSING)
                                        info_add_row(2, "GPS date", "%04d-%02d-%02d",
@@ -275,16 +275,18 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar
                        info_add_row(3, "Accel along", "%8.1f m/s²", state.accel_along());
                        info_add_row(3, "Accel across", "%8.1f m/s²", state.accel_across());
                        info_add_row(3, "Accel through", "%8.1f m/s²", state.accel_through());
+               }
+               if (state != null && state.gyro_roll() != AltosLib.MISSING) {
                        info_add_row(3, "Gyro roll", "%8.1f °/s", state.gyro_roll());
                        info_add_row(3, "Gyro pitch", "%8.1f °/s", state.gyro_pitch());
                        info_add_row(3, "Gyro yaw", "%8.1f °/s", state.gyro_yaw());
-                       if (state.mag_along() != AltosLib.MISSING) {
-                               /* Report mag in nanoteslas (1 G = 100000 nT (or γ)) */
-                               info_add_row(3, "Mag along", "%8.1f µT", state.mag_along() * 100.0);
-                               info_add_row(3, "Mag across", "%8.1f µT", state.mag_across() * 100.0);
-                               info_add_row(3, "Mag Through", "%8.1f µT", state.mag_through() * 100.0);
-                               info_add_row(3, "Mag Bearing", "%8.1f°", Math.atan2(state.mag_across(), state.mag_through()) * 180/Math.PI);
-                       }
+               }
+               if (state != null && state.mag_along() != AltosLib.MISSING) {
+                       /* Report mag in nanoteslas (1 G = 100000 nT (or γ)) */
+                       info_add_row(3, "Mag along", "%8.1f µT", state.mag_along() * 100.0);
+                       info_add_row(3, "Mag across", "%8.1f µT", state.mag_across() * 100.0);
+                       info_add_row(3, "Mag Through", "%8.1f µT", state.mag_through() * 100.0);
+                       info_add_row(3, "Mag Bearing", "%8.1f°", Math.atan2(state.mag_across(), state.mag_through()) * 180/Math.PI);
                }
 
                if (state != null && state.igniter_voltage != null) {