From: Keith Packard <keithp@keithp.com>
Date: Wed, 18 Jul 2012 04:04:58 +0000 (-0700)
Subject: altosui: Accept variations in spacing for igniter status reply
X-Git-Tag: 1.1~71^2~4
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=700818c8ff0518e79bff2f0e80b2cc3cb3b48bf0

altosui: Accept variations in spacing for igniter status reply

Megametrum uses different white space; just deal with it here.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/AltosIgnite.java b/altosui/AltosIgnite.java
index 45d37d16..f84db0b9 100644
--- a/altosui/AltosIgnite.java
+++ b/altosui/AltosIgnite.java
@@ -110,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;
 				}
 			}