From: Keith Packard <keithp@keithp.com>
Date: Wed, 22 Jan 2014 05:34:58 +0000 (-0800)
Subject: altoslib: Fetch target device config for Fire Igniter npyro value
X-Git-Tag: 1.3.1~7
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=677fcafd3816b6d8d86b2dc41b840d97b5ccbf07

altoslib: Fetch target device config for Fire Igniter npyro value

The code was using the AltosLink config_data, which is always the
locally connected device's configuration. When using the packet link,
that's not terribly useful when asking how many extra pyro channels
are available.

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

diff --git a/altoslib/AltosIgnite.java b/altoslib/AltosIgnite.java
index d3c21796..8ab47d1d 100644
--- a/altoslib/AltosIgnite.java
+++ b/altoslib/AltosIgnite.java
@@ -27,6 +27,7 @@ public class AltosIgnite {
 	boolean		link_started;
 	boolean		have_npyro = false;
 	int		npyro;
+	AltosConfigData	config_data;
 
 	public final static String	None = null;
 	public final static String	Apogee = "drogue";
@@ -97,8 +98,12 @@ public class AltosIgnite {
 	}
 
 	private void get_npyro() throws InterruptedException, TimeoutException {
-		AltosConfigData	config_data = link.config_data();
-		npyro = config_data.npyro;
+		if (config_data == null)
+			config_data = new AltosConfigData(link);
+		if (config_data != null)
+			npyro = config_data.npyro;
+		else
+			npyro = 0;
 		have_npyro = true;
 	}