X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosIgniteUI.java;h=5a09252ecc14babaa5d101a7758ae3e33ff4d970;hp=14a2b606cb2651a4db4036645ef857c587f3b569;hb=HEAD;hpb=d6445b3739ac2c5dd040efdb97317a6b2a48044a

diff --git a/altosui/AltosIgniteUI.java b/altosui/AltosIgniteUI.java
index 14a2b606..5a09252e 100644
--- a/altosui/AltosIgniteUI.java
+++ b/altosui/AltosIgniteUI.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,8 +25,8 @@ import java.io.*;
 import java.text.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_8.*;
-import org.altusmetrum.altosuilib_8.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class AltosIgniteUI
 	extends AltosUIDialog
@@ -41,6 +42,7 @@ public class AltosIgniteUI
 	ButtonGroup	group;
 	Boolean		opened;
 
+	boolean		has_standard;
 	int		npyro;
 
 	final static int	timeout = 1 * 1000;
@@ -48,6 +50,8 @@ public class AltosIgniteUI
 	int		time_remaining;
 	boolean		timer_running;
 
+	int		poll_remaining;
+
 	LinkedBlockingQueue<String>	command_queue;
 
 	class Igniter {
@@ -62,7 +66,7 @@ public class AltosIgniteUI
 		}
 
 		Igniter(AltosIgniteUI ui, String label, String name, int y) {
-			Container		pane = getContentPane();
+			Container		pane = getScrollablePane();
 			GridBagConstraints	c = new GridBagConstraints();
 			Insets			i = new Insets(4,4,4,4);
 
@@ -124,7 +128,7 @@ public class AltosIgniteUI
 		public void run () {
 			try {
 				ignite = new AltosIgnite(link,
-							 !device.matchProduct(Altos.product_altimeter));
+							 device.matchProduct(Altos.product_basestation));
 
 			} catch (Exception e) {
 				send_exception(e);
@@ -148,7 +152,7 @@ public class AltosIgniteUI
 						}
 						reply = "status";
 					} else if (command.equals("get_npyro")) {
-						reply = String.format("npyro %d", ignite.npyro());
+						reply = String.format("npyro %d %d", ignite.npyro(), ignite.has_standard() ? 1 : 0);
 					} else if (command.equals("quit")) {
 						ignite.close();
 						break;
@@ -209,7 +213,11 @@ public class AltosIgniteUI
 		} else if (reply.equals("fired")) {
 			fired();
 		} else if (reply.startsWith("npyro")) {
-			npyro = Integer.parseInt(reply.substring(6));
+			String items[] = reply.split("\\s+");
+			npyro = Integer.parseInt(items[1]);
+			if (npyro == AltosLib.MISSING)
+				npyro = 0;
+			has_standard = Integer.parseInt(items[2]) != 0;
 			make_ui();
 		}
 	}
@@ -252,17 +260,18 @@ public class AltosIgniteUI
 
 	boolean	getting_status = false;
 
-	boolean	visible = false;
-
 	void set_ignite_status() {
 		getting_status = false;
-		if (!visible) {
-			visible = true;
+		poll_remaining = 2;
+		if (!isVisible())
 			setVisible(true);
-		}
 	}
 
 	void poll_ignite_status() {
+		if (poll_remaining > 0) {
+			--poll_remaining;
+			return;
+		}
 		if (!getting_status) {
 			getting_status = true;
 			send_command("get_status");
@@ -382,7 +391,7 @@ public class AltosIgniteUI
 	private void make_ui() {
 		group = new ButtonGroup();
 
-		Container		pane = getContentPane();
+		Container		pane = getScrollablePane();
 
 		GridBagConstraints	c = new GridBagConstraints();
 		Insets			i = new Insets(4,4,4,4);
@@ -411,15 +420,21 @@ public class AltosIgniteUI
 
 		y++;
 
-		igniters = new Igniter[2 + npyro];
+		int nstandard = 0;
+		if (has_standard)
+			nstandard = 2;
+
+		igniters = new Igniter[nstandard + npyro];
 
-		igniters[0] = new Igniter(this, "Apogee", AltosIgnite.Apogee, y++);
-		igniters[1] = new Igniter(this, "Main", AltosIgnite.Main, y++);
+		if (has_standard) {
+			igniters[0] = new Igniter(this, "Apogee", AltosIgnite.Apogee, y++);
+			igniters[1] = new Igniter(this, "Main", AltosIgnite.Main, y++);
+		}
 
 		for (int p = 0; p < npyro; p++) {
 			String	name = String.format("%d", p);
 			String	label = String.format("%c", 'A' + p);
-			igniters[2+p] = new Igniter(this, label, name, y++);
+			igniters[nstandard+p] = new Igniter(this, label, name, y++);
 		}
 
 		c.gridx = 0;