altoslib: add missing manufacturer parsing for AltosConfigData

[fw/altos] / altoslib / AltosConfigData.java

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 4ad4e58a2955972d645e2bc85b7f5df828d2fdc3..c143036c1a9e13ecc05837631ebb66d7b42a2966 100644 (file)
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -104,7 +104,7 @@ public class AltosConfigData implements Iterable<String> {
 
                for (int i = 0; i < parts.length; i++) {
                        try {
-                               r[i] = Altos.fromdec(parts[i]);
+                               r[i] = AltosLib.fromdec(parts[i]);
                        } catch (NumberFormatException n) {
                                r[i] = 0;
                        }
@@ -132,7 +132,7 @@ public class AltosConfigData implements Iterable<String> {
        }
 
        public AltosConfigData(AltosLink link) throws InterruptedException, TimeoutException {
-               link.printf("c s\np\nf\nl\nv\n");
+               link.printf("c s\nf\nl\nv\n");
                lines = new LinkedList<String>();
                radio_setting = 0;
                radio_frequency = 0;
@@ -170,6 +170,7 @@ public class AltosConfigData implements Iterable<String> {
                        try { callsign = get_string(line, "Callsign:"); } catch (Exception e) {}
                        try { version = get_string(line,"software-version"); } catch (Exception e) {}
                        try { product = get_string(line,"product"); } catch (Exception e) {}
+                       try { manufacturer = get_string(line,"manufacturer"); } catch (Exception e) {}
 
                        try { get_int(line, "flight"); stored_flight++; }  catch (Exception e) {}
                        try { storage_size = get_int(line, "Storage size:"); } catch (Exception e) {}