altos: Execute self-test on MMA655X part

[fw/altos] / altosui / AltosInfoTable.java

diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java
index d7871aa6b61bc3cc390bde0d9ad59926c8597d89..cf0e4c56faacecd4a86c511c7a70933b99437d68 100644 (file)
--- a/altosui/AltosInfoTable.java
+++ b/altosui/AltosInfoTable.java
@@ -20,7 +20,7 @@ package altosui;
 import java.awt.*;
 import javax.swing.*;
 import javax.swing.table.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
 
 public class AltosInfoTable extends JTable {
        private AltosFlightInfoTableModel model;
@@ -107,6 +107,8 @@ public class AltosInfoTable extends JTable {
        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)
@@ -141,10 +143,6 @@ public class AltosInfoTable extends JTable {
 
                if (state != null) {
                        if (state.gps == null || !state.gps.connected) {
-                               if (state.gps == null)
-                                       System.out.printf ("null gps\n");
-                               else
-                                       System.out.printf ("not connected gps\n");
                                info_add_row(1, "GPS", "not available");
                        } else {
                                if (state.gps_ready)