clean up all existing lintian warnings

[fw/altos] / altosui / AltosConfigData.java

diff --git a/altosui/AltosConfigData.java b/altosui/AltosConfigData.java
index 3f0e9af3f31869b921884a3e98041b9469123132..1d50ade9aeaa0a2c3ec48327537b8a3c86fb20fd 100644 (file)
--- a/altosui/AltosConfigData.java
+++ b/altosui/AltosConfigData.java
@@ -85,7 +85,7 @@ public class AltosConfigData implements Iterable<String> {
                serial_line.printf("c s\nv\n");
                lines = new LinkedList<String>();
                for (;;) {
-                       String line = serial_line.get_reply(5000);
+                       String line = serial_line.get_reply_no_dialog(5000);
                        if (line == null)
                                throw new TimeoutException();
                        if (line.contains("Syntax error"))
@@ -95,6 +95,15 @@ public class AltosConfigData implements Iterable<String> {
                        try { main_deploy = get_int(line, "Main deploy:"); } catch (Exception e) {}
                        try { apogee_delay = get_int(line, "Apogee delay:"); } catch (Exception e) {}
                        try { radio_channel = get_int(line, "Radio channel:"); } catch (Exception e) {}
+                       try {
+                               if (line.startsWith("Accel cal")) {
+                                       String[] bits = line.split("\\s+");
+                                       if (bits.length >= 6) {
+                                               accel_cal_plus = Integer.parseInt(bits[3]);
+                                               accel_cal_minus = Integer.parseInt(bits[5]);
+                                       }
+                               }
+                       } catch (Exception e) {}
                        try { radio_calibration = get_int(line, "Radio cal:"); } catch (Exception e) {}
                        try { flight_log_max = get_int(line, "Max flight log:"); } catch (Exception e) {}
                        try { ignite_mode = get_int(line, "Ignite mode:"); } catch (Exception e) {}