altoslib: Don't record 'pad' state in FlightSeries

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 95c1a99f8384b153e652f228446bce91de967ebd..a252abdf754345ef278ae8f5b606b7d8f8fe7ab4 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -191,7 +191,7 @@ public class AltosConvert {
        }
 
        public static double
-       cc_ignitor_to_voltage(double ignite)
+       cc_igniter_to_voltage(double ignite)
        {
                return ignite / 32767 * 15.0;
        }
@@ -403,6 +403,10 @@ public class AltosConvert {
 
                double counts_per_g = (plus_g - minus_g) / 2.0;
                double counts_per_mss = counts_per_g / gravity;
+
+               if (counts_per_mss == 0)
+                       return AltosLib.MISSING;
+
                return (sensor - ground) / counts_per_mss;
        }
 
@@ -434,6 +438,10 @@ public class AltosConvert {
 
        public static AltosStateName state_name = new AltosStateName();
 
+       public static AltosPyroName pyro_name = new AltosPyroName();
+
+       public static AltosUnits magnetic_field = null;
+
        public static String show_gs(String format, double a) {
                a = meters_to_g(a);
                format = format.concat(" g");