diff options
| author | Keith Packard <keithp@keithp.com> | 2011-08-08 01:47:29 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-08-08 12:13:29 -0700 |
| commit | 0e3e4f9c1e6a6bf972514f12c9d622258aa2aec2 (patch) | |
| tree | c84c97e27556d0686bf26ea9e4f1af976cd9b1c7 /altosui/AltosConfigData.java | |
| parent | f03ca0ab8799bfa5100eaa2577cfd7b9c37d05bf (diff) | |
altosui: Convert from channels to frequencies
Major areas:
* Preferences are stored as frequencies instead
of channels
* Serial configuration is done using frequencies
* UI is presented with frequency lists
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosui/AltosConfigData.java')
| -rw-r--r-- | altosui/AltosConfigData.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/altosui/AltosConfigData.java b/altosui/AltosConfigData.java index 1d50ade9..aa7a90de 100644 --- a/altosui/AltosConfigData.java +++ b/altosui/AltosConfigData.java @@ -47,6 +47,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; @@ -85,7 +86,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_no_dialog(5000); + String line = serial_line.get_reply(); if (line == null) throw new TimeoutException(); if (line.contains("Syntax error")) @@ -95,6 +96,7 @@ 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 { radio_setting = get_int(line, "Radio setting:"); } catch (Exception e) {} try { if (line.startsWith("Accel cal")) { String[] bits = line.split("\\s+"); |