Get AltOS version numbers into Mac 'about' dialog

[fw/altos] / altosui / AltosIdleMonitorUI.java

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 8eb0d520c339f88ad5d99c5a87d1f9561e580dfd..949e392675b352b9a08a79afbc22f40f9b4e1197 100644 (file)
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 class AltosADC {
        int     tick;
@@ -203,17 +204,18 @@ class AltosIdleMonitor extends Thread {
                record.state = Altos.ao_flight_idle;
 
                record.tick = adc.tick;
-               record.accel = adc.accel;
-               record.pres = adc.pres;
-               record.batt = adc.batt;
-               record.temp = adc.temp;
-               record.drogue = adc.drogue;
-               record.main = adc.main;
-
-               record.ground_accel = record.accel;
-               record.ground_pres = record.pres;
-               record.accel_plus_g = config_data.accel_cal_plus;
-               record.accel_minus_g = config_data.accel_cal_minus;
+
+//             record.accel = adc.accel;
+//             record.pres = adc.pres;
+//             record.batt = adc.batt;
+//             record.temp = adc.temp;
+//             record.drogue = adc.drogue;
+//             record.main = adc.main;
+
+//             record.ground_accel = record.accel;
+//             record.ground_pres = record.pres;
+//             record.accel_plus_g = config_data.accel_cal_plus;
+//             record.accel_minus_g = config_data.accel_cal_minus;
                record.acceleration = 0;
                record.speed = 0;
                record.height = 0;
@@ -324,7 +326,7 @@ public class AltosIdleMonitorUI extends AltosFrame implements AltosFlightDisplay
 
                device = AltosDeviceDialog.show(in_owner, Altos.product_any);
                remote = false;
-               if (!device.matchProduct(Altos.product_telemetrum))
+               if (!device.matchProduct(Altos.product_altimeter))
                        remote = true;
 
                serial = device.getSerial();