X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=6f343639e72680120b6c064f4e82db4fa188ae28;hp=4ad4e58a2955972d645e2bc85b7f5df828d2fdc3;hb=e2b458a448106ba1ab207f0ea6824b56927d8547;hpb=69e6df07976a56b49e07c242cd6e5b2cbd2a578d

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 4ad4e58a..6f343639 100644
--- 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> {
 
@@ -104,7 +101,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 +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) {}