altosui: Complete split out of separate java library

[fw/altos] / altosui / AltosConfigData.java

diff --git a/altosui/AltosConfigData.java b/altosui/AltosConfigData.java
index 0608b4d396ef2b98d7190a8d6529ec3e6f0a2689..ef34dd3ee06747ed6e2e0260e54bd670c2f816cb 100644 (file)
--- a/altosui/AltosConfigData.java
+++ b/altosui/AltosConfigData.java
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 import libaltosJNI.*;
 
@@ -138,7 +139,7 @@ public class AltosConfigData implements Iterable<String> {
        }
 
        public AltosConfigData(AltosSerial serial_line) throws InterruptedException, TimeoutException {
-               serial_line.printf("c s\nf\nl\nv\n");
+               serial_line.printf("c s\np\nf\nl\nv\n");
                lines = new LinkedList<String>();
                radio_setting = 0;
                radio_frequency = 0;
@@ -156,7 +157,11 @@ public class AltosConfigData implements Iterable<String> {
                        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 { radio_frequency = get_int(line, "Frequency:"); } catch (Exception e) {}
+                       try {
+                               radio_frequency = get_int(line, "Frequency:");
+                               if (radio_frequency < 0)
+                                       radio_frequency = 434550;
+                       } catch (Exception e) {}
                        try {
                                if (line.startsWith("Accel cal")) {
                                        String[] bits = line.split("\\s+");