X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigData.java;h=016033a3fa93782e4cefa24ebdef54051c9e5c9b;hb=81bb6f42d8b859195ea5a35806c42d98ba82e8e1;hp=1d50ade9aeaa0a2c3ec48327537b8a3c86fb20fd;hpb=3cc2eed6cdafe788a8617ab45c6664077e76411e;p=fw%2Faltos diff --git a/altosui/AltosConfigData.java b/altosui/AltosConfigData.java index 1d50ade9..016033a3 100644 --- a/altosui/AltosConfigData.java +++ b/altosui/AltosConfigData.java @@ -47,6 +47,7 @@ public class AltosConfigData implements Iterable { 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,8 +85,9 @@ public class AltosConfigData implements Iterable { public AltosConfigData(AltosSerial serial_line) throws InterruptedException, TimeoutException { serial_line.printf("c s\nv\n"); lines = new LinkedList(); + radio_setting = 0; for (;;) { - String line = serial_line.get_reply_no_dialog(5000); + String line = serial_line.get_reply(); if (line == null) throw new TimeoutException(); if (line.contains("Syntax error")) @@ -95,6 +97,7 @@ public class AltosConfigData implements Iterable { 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+");