altoslib: Do data analysis on raw values rather than AltosState

[fw/altos] / altoslib / AltosConfigData.java

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 23ab1e113cd0264ac6b883f1761740a56a8023c3..1972ca0f8cca87617d46069f369c725443b0e259 100644 (file)
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -22,7 +22,7 @@ import java.util.*;
 import java.text.*;
 import java.util.concurrent.*;
 
-public class AltosConfigData implements Iterable<String> {
+public class AltosConfigData {
 
        /* Version information */
        public String   manufacturer;
@@ -34,9 +34,6 @@ public class AltosConfigData implements Iterable<String> {
        public String   version;
        public int      altitude_32;
 
-       /* Strings returned */
-       public LinkedList<String>       __lines;
-
        /* Config information */
        /* HAS_FLIGHT*/
        public int      main_deploy;
@@ -96,14 +93,13 @@ public class AltosConfigData implements Iterable<String> {
        public int      accel_zero_along, accel_zero_across, accel_zero_through;
 
        /* ms5607 data */
-       public int      ms5607_reserved;
-       public int      ms5607_sens;
-       public int      ms5607_off;
-       public int      ms5607_tcs;
-       public int      ms5607_tco;
-       public int      ms5607_tref;
-       public int      ms5607_tempsens;
-       public int      ms5607_crc;
+       AltosMs5607     ms5607;
+
+       public AltosMs5607 ms5607() {
+               if (ms5607 == null)
+                       ms5607 = new AltosMs5607();
+               return ms5607;
+       }
 
        public static String get_string(String line, String label) throws  ParseException {
                if (line.startsWith(label)) {
@@ -142,10 +138,6 @@ public class AltosConfigData implements Iterable<String> {
                throw new ParseException("mismatch", 0);
        }
 
-       public Iterator<String> iterator() {
-               return __lines.iterator();
-       }
-
        public int log_space() {
                if (log_space > 0)
                        return log_space;
@@ -214,6 +206,10 @@ public class AltosConfigData implements Iterable<String> {
                return r;
        }
 
+       public boolean altitude_32() {
+               return altitude_32 == 1;
+       }
+
        public int compare_version(String other) {
                int[]   me = parse_version(version);
                int[]   them = parse_version(other);
@@ -233,8 +229,6 @@ public class AltosConfigData implements Iterable<String> {
        }
 
        public void reset() {
-               __lines = new LinkedList<String>();
-
                manufacturer = null;
                product = null;
                serial = AltosLib.MISSING;
@@ -289,7 +283,6 @@ public class AltosConfigData implements Iterable<String> {
        }
 
        public void parse_line(String line) {
-               __lines.add(line);
                /* Version replies */
                try { manufacturer = get_string(line, "manufacturer"); } catch (Exception e) {}
                try { product = get_string(line, "product"); } catch (Exception e) {}
@@ -302,14 +295,14 @@ public class AltosConfigData implements Iterable<String> {
 
                /* Version also contains MS5607 info, which we ignore here */
 
-               try { ms5607_reserved = get_int(line, "ms5607 reserved:"); } catch (Exception e) {}
-               try { ms5607_sens = get_int(line, "ms5607 sens:"); } catch (Exception e) {}
-               try { ms5607_off = get_int(line, "ms5607 off:"); } catch (Exception e) {}
-               try { ms5607_tcs = get_int(line, "ms5607 tcs:"); } catch (Exception e) {}
-               try { ms5607_tco = get_int(line, "ms5607 tco:"); } catch (Exception e) {}
-               try { ms5607_tref = get_int(line, "ms5607 tref:"); } catch (Exception e) {}
-               try { ms5607_tempsens = get_int(line, "ms5607 tempsens:"); } catch (Exception e) {}
-               try { ms5607_crc = get_int(line, "ms5607 crc:"); } catch (Exception e) {}
+               try { ms5607().reserved = get_int(line, "ms5607 reserved:"); } catch (Exception e) {}
+               try { ms5607().sens = get_int(line, "ms5607 sens:"); } catch (Exception e) {}
+               try { ms5607().off = get_int(line, "ms5607 off:"); } catch (Exception e) {}
+               try { ms5607().tcs = get_int(line, "ms5607 tcs:"); } catch (Exception e) {}
+               try { ms5607().tco = get_int(line, "ms5607 tco:"); } catch (Exception e) {}
+               try { ms5607().tref = get_int(line, "ms5607 tref:"); } catch (Exception e) {}
+               try { ms5607().tempsens = get_int(line, "ms5607 tempsens:"); } catch (Exception e) {}
+               try { ms5607().crc = get_int(line, "ms5607 crc:"); } catch (Exception e) {}
 
                /* Config show replies */
 
@@ -438,11 +431,11 @@ public class AltosConfigData implements Iterable<String> {
 
                if (frequency > 0) {
                        radio_frequency = (int) Math.floor (freq * 1000 + 0.5);
-                       radio_channel = -1;
+                       radio_channel = AltosLib.MISSING;
                } else if (setting > 0) {
                        radio_setting =AltosConvert.radio_frequency_to_setting(freq,
                                                                                    radio_calibration);
-                       radio_channel = -1;
+                       radio_channel = AltosLib.MISSING;
                } else {
                        radio_channel = AltosConvert.radio_frequency_to_channel(freq);
                }
@@ -453,7 +446,7 @@ public class AltosConfigData implements Iterable<String> {
                int     setting = radio_setting;
 
                if (radio_frequency < 0 && channel < 0 && setting < 0)
-                       return -1;
+                       return AltosLib.MISSING;
 
                if (channel < 0)
                        channel = 0;