altos: Correct AO_CONFIG_MINOR from 6 to 7

[fw/altos] / altosui / AltosConfigData.java

diff --git a/altosui/AltosConfigData.java b/altosui/AltosConfigData.java
index 3f0e9af3f31869b921884a3e98041b9469123132..710231d74c827fb7380c40f698dd5a04e6d8582f 100644 (file)
--- a/altosui/AltosConfigData.java
+++ b/altosui/AltosConfigData.java
@@ -36,6 +36,7 @@ public class AltosConfigData implements Iterable<String> {
        String  manufacturer;
        String  product;
        String  version;
+       int     log_format;
        int     serial;
 
        /* Strings returned */
@@ -47,6 +48,7 @@ public class AltosConfigData implements Iterable<String> {
        int     main_deploy;
        int     apogee_delay;
        int     radio_channel;
+       int     radio_setting;
        String  callsign;
        int     accel_cal_plus, accel_cal_minus;
        int     radio_calibration;
@@ -84,17 +86,29 @@ public class AltosConfigData implements Iterable<String> {
        public AltosConfigData(AltosSerial serial_line) throws InterruptedException, TimeoutException {
                serial_line.printf("c s\nv\n");
                lines = new LinkedList<String>();
+               radio_setting = 0;
                for (;;) {
-                       String line = serial_line.get_reply(5000);
+                       String line = serial_line.get_reply();
                        if (line == null)
                                throw new TimeoutException();
                        if (line.contains("Syntax error"))
                                continue;
                        lines.add(line);
                        try { serial = get_int(line, "serial-number"); } catch (Exception e) {}
+                       try { log_format = get_int(line, "log-format"); } catch (Exception e) {}
                        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 { radio_setting = get_int(line, "Radio setting:"); } 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) {}