first cut at turnon scripts for EasyTimer v2

[fw/altos] / altoslib / AltosIgnite.java

diff --git a/altoslib/AltosIgnite.java b/altoslib/AltosIgnite.java
index f3c07339b0fc411ec52ef195723a9f1b05869db5..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
- * 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
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_14;
 
 import java.util.*;
 import java.io.*;
@@ -26,7 +27,8 @@ public class AltosIgnite {
        boolean         remote;
        boolean         close_on_exit;
        boolean         link_started;
-       boolean         have_npyro = false;
+       boolean         has_pyro_info = false;
+       boolean         has_standard = false;
        int             npyro;
        AltosConfigData config_data;
 
@@ -101,15 +103,18 @@ public class AltosIgnite {
        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;
-               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 {
-               if (!have_npyro) {
+               if (!has_pyro_info) {
                        start_link();
                        get_npyro();
                        stop_link();
@@ -117,6 +122,15 @@ public class AltosIgnite {
                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>();
 
@@ -173,6 +187,7 @@ public class AltosIgnite {
                try {
                        start_link();
                        link.printf("i DoIt %s\n", igniter);
+                       link.flush_output();
                } catch (TimeoutException te) {
                } finally {
                        stop_link();