X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosIgnite.java;h=45d37d167dbff2d23c31d9395b6966159f7cd35c;hb=75d6aa6f798606f1a6c5a46542065dda81e63b2a;hp=7a06c63d41244a7a53d2581c15d17907f93b1400;hpb=44fb71ca3e5bccd5f601fc5a2d5da7292050b1d6;p=fw%2Faltos

diff --git a/altosui/AltosIgnite.java b/altosui/AltosIgnite.java
index 7a06c63d..45d37d16 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;
@@ -40,7 +41,7 @@ public class AltosIgnite {
 	final static int	Active = 2;
 	final static int	Open = 3;
 
-	private void start_serial() throws InterruptedException {
+	private void start_serial() throws InterruptedException, TimeoutException {
 		serial_started = true;
 		if (remote)
 			serial.start_remote();
@@ -102,22 +103,25 @@ public class AltosIgnite {
 		if (serial == null)
 			return status;
 		string_ref status_name = new string_ref();
-		start_serial();
-		serial.printf("t\n");
-		for (;;) {
-			String line = serial.get_reply(5000);
-			if (line == null)
-				throw new TimeoutException();
-			if (get_string(line, "Igniter: drogue Status: ", status_name))
-				if (igniter == Apogee)
-					status = status(status_name.get());
-			if (get_string(line, "Igniter:   main Status: ", status_name)) {
-				if (igniter == Main)
-					status = status(status_name.get());
-				break;
+		try {
+			start_serial();
+			serial.printf("t\n");
+			for (;;) {
+				String line = serial.get_reply(5000);
+				if (line == null)
+					throw new TimeoutException();
+				if (get_string(line, "Igniter: drogue Status: ", status_name))
+					if (igniter == Apogee)
+						status = status(status_name.get());
+				if (get_string(line, "Igniter:   main Status: ", status_name)) {
+					if (igniter == Main)
+						status = status(status_name.get());
+					break;
+				}
 			}
+		} finally {
+			stop_serial();
 		}
-		stop_serial();
 		return status;
 	}
 
@@ -145,6 +149,7 @@ public class AltosIgnite {
 				break;
 			}
 		} catch (InterruptedException ie) {
+		} catch (TimeoutException te) {
 		} finally {
 			try {
 				stop_serial();
@@ -166,13 +171,14 @@ public class AltosIgnite {
 		serial.set_frame(frame);
 	}
 
-	public AltosIgnite(AltosDevice in_device) throws FileNotFoundException, AltosSerialInUseException {
+	public AltosIgnite(AltosDevice in_device)
+		throws FileNotFoundException, AltosSerialInUseException, TimeoutException, InterruptedException {
 
 		device = in_device;
 		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