projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lisp: Fix some scheme compat issues
[fw/altos]
/
altoslib
/
AltosIgnite.java
diff --git
a/altoslib/AltosIgnite.java
b/altoslib/AltosIgnite.java
index d3c21796690fec5585f8460e9f9e20d30dff8554..767c00fbaf1689d4f8c5399518656c6594496995 100644
(file)
--- a/
altoslib/AltosIgnite.java
+++ b/
altoslib/AltosIgnite.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
*
* 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,7
+16,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_
12
;
import java.util.*;
import java.io.*;
import java.util.*;
import java.io.*;
@@
-24,9
+25,11
@@
import java.util.concurrent.*;
public class AltosIgnite {
AltosLink link;
boolean remote;
public class AltosIgnite {
AltosLink link;
boolean remote;
+ boolean close_on_exit;
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
+100,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 && config_data.npyro != AltosLib.MISSING)
+ npyro = config_data.npyro;
+ else
+ npyro = 0;
have_npyro = true;
}
have_npyro = true;
}
@@
-167,6
+174,7
@@
public class AltosIgnite {
try {
start_link();
link.printf("i DoIt %s\n", igniter);
try {
start_link();
link.printf("i DoIt %s\n", igniter);
+ link.flush_output();
} catch (TimeoutException te) {
} finally {
stop_link();
} catch (TimeoutException te) {
} finally {
stop_link();
@@
-175,14
+183,18
@@
public class AltosIgnite {
public void close() throws InterruptedException {
stop_link();
public void close() throws InterruptedException {
stop_link();
- link.close();
+ if (close_on_exit)
+ link.close();
link = null;
}
link = null;
}
- public AltosIgnite(AltosLink in_link, boolean in_remote)
- throws FileNotFoundException, TimeoutException, InterruptedException {
-
+ public AltosIgnite(AltosLink in_link, boolean in_remote, boolean in_close_on_exit) {
link = in_link;
remote = in_remote;
link = in_link;
remote = in_remote;
+ close_on_exit = in_close_on_exit;
+ }
+
+ public AltosIgnite(AltosLink in_link, boolean in_remote) {
+ this(in_link, in_remote, true);
}
}
-}
\ No newline at end of file
+}