clean up telefireone name references

[fw/altos] / altoslib / AltosConfigData.java

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index ce430d7a9137f082ddffcf667acd7f7c805f1dd8..23ab1e113cd0264ac6b883f1761740a56a8023c3 100644 (file)
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.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
@@ -34,7 +35,7 @@ public class AltosConfigData implements Iterable<String> {
        public int      altitude_32;
 
        /* Strings returned */
-       public LinkedList<String>       lines;
+       public LinkedList<String>       __lines;
 
        /* Config information */
        /* HAS_FLIGHT*/
@@ -142,7 +143,7 @@ public class AltosConfigData implements Iterable<String> {
        }
 
        public Iterator<String> iterator() {
-               return lines.iterator();
+               return __lines.iterator();
        }
 
        public int log_space() {
@@ -232,63 +233,63 @@ public class AltosConfigData implements Iterable<String> {
        }
 
        public void reset() {
-               lines = new LinkedList<String>();
+               __lines = new LinkedList<String>();
 
-               manufacturer = "unknown";
-               product = "unknown";
-               serial = 0;
-               flight = 0;
+               manufacturer = null;
+               product = null;
+               serial = AltosLib.MISSING;
+               flight = AltosLib.MISSING;
                log_format = AltosLib.AO_LOG_FORMAT_UNKNOWN;
-               log_space = -1;
+               log_space = AltosLib.MISSING;
                version = "unknown";
 
-               main_deploy = -1;
-               apogee_delay = -1;
-               apogee_lockout = -1;
+               main_deploy = AltosLib.MISSING;
+               apogee_delay = AltosLib.MISSING;
+               apogee_lockout = AltosLib.MISSING;
 
-               radio_frequency = -1;
+               radio_frequency = AltosLib.MISSING;
                callsign = null;
-               radio_enable = -1;
-               radio_calibration = -1;
-               radio_channel = -1;
-               radio_setting = -1;
-               telemetry_rate = -1;
+               radio_enable = AltosLib.MISSING;
+               radio_calibration = AltosLib.MISSING;
+               radio_channel = AltosLib.MISSING;
+               radio_setting = AltosLib.MISSING;
+               telemetry_rate = AltosLib.MISSING;
 
-               accel_cal_plus = -1;
-               accel_cal_minus = -1;
-               pad_orientation = -1;
+               accel_cal_plus = AltosLib.MISSING;
+               accel_cal_minus = AltosLib.MISSING;
+               pad_orientation = AltosLib.MISSING;
 
-               flight_log_max = -1;
-               log_fixed = -1;
-               ignite_mode = -1;
+               flight_log_max = AltosLib.MISSING;
+               log_fixed = AltosLib.MISSING;
+               ignite_mode = AltosLib.MISSING;
 
-               aes_key = "";
+               aes_key = null;
 
                pyro = 0;
                npyro = 0;
                pyros = null;
-               pyro_firing_time = -1;
+               pyro_firing_time = AltosLib.MISSING;
 
-               aprs_interval = -1;
-               aprs_ssid = -1;
-               aprs_format = -1;
+               aprs_interval = AltosLib.MISSING;
+               aprs_ssid = AltosLib.MISSING;
+               aprs_format = AltosLib.MISSING;
 
-               beep = -1;
+               beep = AltosLib.MISSING;
 
-               tracker_motion = -1;
-               tracker_interval = -1;
+               tracker_motion = AltosLib.MISSING;
+               tracker_interval = AltosLib.MISSING;
 
-               storage_size = -1;
-               storage_erase_unit = -1;
-               stored_flight = 0;
+               storage_size = AltosLib.MISSING;
+               storage_erase_unit = AltosLib.MISSING;
+               stored_flight = AltosLib.MISSING;
 
-               accel_zero_along = -1;
-               accel_zero_across = -1;
-               accel_zero_through = -1;
+               accel_zero_along = AltosLib.MISSING;
+               accel_zero_across = AltosLib.MISSING;
+               accel_zero_through = AltosLib.MISSING;
        }
 
        public void parse_line(String line) {
-               lines.add(line);
+               __lines.add(line);
                /* Version replies */
                try { manufacturer = get_string(line, "manufacturer"); } catch (Exception e) {}
                try { product = get_string(line, "product"); } catch (Exception e) {}
@@ -718,5 +719,4 @@ public class AltosConfigData implements Iterable<String> {
                        break;
                }
        }
-
 }