altosui: Complete split out of separate java library

[fw/altos] / altosui / AltosConfigData.java

diff --git a/altosui/AltosConfigData.java b/altosui/AltosConfigData.java
index c14dc5a18a78c186f1d503591d89b6fd8298969a..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.*;
 
@@ -49,6 +50,7 @@ public class AltosConfigData implements Iterable<String> {
        int     apogee_delay;
        int     radio_channel;
        int     radio_setting;
+       int     radio_frequency;
        String  callsign;
        int     accel_cal_plus, accel_cal_minus;
        int     radio_calibration;
@@ -103,10 +105,44 @@ public class AltosConfigData implements Iterable<String> {
                }
        }
 
+       int[] parse_version(String v) {
+               String[] parts = v.split("\\.");
+               int r[] = new int[parts.length];
+
+               for (int i = 0; i < parts.length; i++) {
+                       try {
+                               r[i] = Altos.fromdec(parts[i]);
+                       } catch (NumberFormatException n) {
+                               r[i] = 0;
+                       }
+               }
+
+               return r;
+       }
+       
+       public int compare_version(String other) {
+               int[]   me = parse_version(version);
+               int[]   them = parse_version(other);
+
+               int     l = Math.min(me.length, them.length);
+
+               for (int i = 0; i < l; i++) {
+                       int     d = me[i] - them[i];
+                       if (d != 0)
+                               return d;
+               }
+               if (me.length > l)
+                       return 1;
+               if (them.length > l)
+                       return -1;
+               return 0;
+       }
+
        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;
                stored_flight = 0;
                for (;;) {
                        String line = serial_line.get_reply();
@@ -121,6 +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:");
+                               if (radio_frequency < 0)
+                                       radio_frequency = 434550;
+                       } catch (Exception e) {}
                        try {
                                if (line.startsWith("Accel cal")) {
                                        String[] bits = line.split("\\s+");