Merge remote-tracking branch 'mjb/altoslib_mjb'

[fw/altos] / altoslib / AltosConfigData.java

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index fa6a72b5045bf2c10aad7c1dcd65fe505227d4d5..6f343639e72680120b6c064f4e82db4fa188ae28 100644 (file)
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -17,12 +17,9 @@
 
 package org.altusmetrum.AltosLib;
 
-import java.io.*;
 import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosConfigData implements Iterable<String> {
 
@@ -132,7 +129,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 +167,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) {}