X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosIgnite.java;h=f84db0b943175c374f4be7ccdaebf20081772e2d;hb=e2b472bbb2418fc13be42dbc7c52beb88479c46d;hp=3e52ea369d471f82efb91d96281745670a816bb2;hpb=0e3e4f9c1e6a6bf972514f12c9d622258aa2aec2;p=fw%2Faltos

diff --git a/altosui/AltosIgnite.java b/altosui/AltosIgnite.java
index 3e52ea36..f84db0b9 100644
--- a/altosui/AltosIgnite.java
+++ b/altosui/AltosIgnite.java
@@ -25,6 +25,7 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.table.*;
 import javax.swing.event.*;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosIgnite {
 	AltosDevice	device;
@@ -109,12 +110,23 @@ public class AltosIgnite {
 				String line = serial.get_reply(5000);
 				if (line == null)
 					throw new TimeoutException();
-				if (get_string(line, "Igniter: drogue Status: ", status_name))
+				String[] items = line.split("\\s+");
+
+				if (items.length < 4)
+					continue;
+
+				if (!items[0].equals("Igniter:"))
+					continue;
+
+				if (!items[2].equals("Status:"))
+					continue;
+
+				if (items[1].equals("drogue")) {
 					if (igniter == Apogee)
-						status = status(status_name.get());
-				if (get_string(line, "Igniter:   main Status: ", status_name)) {
+						status = status(items[3]);
+				} else if (items[1].equals("main")) {
 					if (igniter == Main)
-						status = status(status_name.get());
+						status = status(items[3]);
 					break;
 				}
 			}
@@ -177,7 +189,7 @@ public class AltosIgnite {
 		serial = new AltosSerial(device);
 		remote = false;
 
-		if (!device.matchProduct(Altos.product_telemetrum))
+		if (!device.matchProduct(Altos.product_altimeter))
 			remote = true;
 	}
 }
\ No newline at end of file