projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Fix idle monitor parsing of MMA655x state
[fw/altos]
/
altoslib
/
AltosIgnite.java
diff --git
a/altoslib/AltosIgnite.java
b/altoslib/AltosIgnite.java
index d3c21796690fec5585f8460e9f9e20d30dff8554..b458911ec61884d4bd144a5b50d934d8fd2fc454 100644
(file)
--- a/
altoslib/AltosIgnite.java
+++ b/
altoslib/AltosIgnite.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
3
;
+package org.altusmetrum.altoslib_
5
;
import java.util.*;
import java.io.*;
import java.util.*;
import java.io.*;
@@
-27,6
+27,7
@@
public class AltosIgnite {
boolean link_started;
boolean have_npyro = false;
int npyro;
boolean link_started;
boolean have_npyro = false;
int npyro;
+ AltosConfigData config_data;
public final static String None = null;
public final static String Apogee = "drogue";
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 {
}
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;
}
have_npyro = true;
}