projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telelco-v3.0: Merge info into one screen
[fw/altos]
/
altoslib
/
AltosIgnite.java
diff --git
a/altoslib/AltosIgnite.java
b/altoslib/AltosIgnite.java
index ffb6ed158d1e74d6bef8afaef9fa1ac80ade351b..d1ec5104386025bd4d347a03fe9e4e973b702638 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_
6
;
+package org.altusmetrum.altoslib_
14
;
import java.util.*;
import java.io.*;
import java.util.*;
import java.io.*;
@@
-24,8
+25,10
@@
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 link_started;
- boolean have_npyro = false;
+ boolean has_pyro_info = false;
+ boolean has_standard = false;
int npyro;
AltosConfigData config_data;
int npyro;
AltosConfigData config_data;
@@
-100,15
+103,18
@@
public class AltosIgnite {
private void get_npyro() throws InterruptedException, TimeoutException {
if (config_data == null)
config_data = new AltosConfigData(link);
private void get_npyro() throws InterruptedException, TimeoutException {
if (config_data == null)
config_data = new AltosConfigData(link);
- if (config_data != null)
+ if (config_data != null
&& config_data.npyro != AltosLib.MISSING
)
npyro = config_data.npyro;
else
npyro = 0;
npyro = config_data.npyro;
else
npyro = 0;
- have_npyro = true;
+ if (config_data != null)
+ has_standard = config_data.ignite_mode != AltosLib.MISSING;
+
+ has_pyro_info = true;
}
public int npyro() throws InterruptedException, TimeoutException {
}
public int npyro() throws InterruptedException, TimeoutException {
- if (!ha
ve_npyr
o) {
+ if (!ha
s_pyro_inf
o) {
start_link();
get_npyro();
stop_link();
start_link();
get_npyro();
stop_link();
@@
-116,6
+122,15
@@
public class AltosIgnite {
return npyro;
}
return npyro;
}
+ public boolean has_standard() throws InterruptedException, TimeoutException {
+ if (!has_pyro_info) {
+ start_link();
+ get_npyro();
+ stop_link();
+ }
+ return has_standard;
+ }
+
public HashMap<String,Integer> status() throws InterruptedException, TimeoutException {
HashMap<String,Integer> status = new HashMap<String,Integer>();
public HashMap<String,Integer> status() throws InterruptedException, TimeoutException {
HashMap<String,Integer> status = new HashMap<String,Integer>();
@@
-172,6
+187,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();
@@
-180,14
+196,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
+}