altoslib: Fix labels in AltosIMU to match source data

[fw/altos] / altoslib / AltosDataListener.java

diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java
index b644e8170c3ae3b94f5b844fd7ab0082d88b45b7..f8d38731ea5004138ebf579d1f70e7d6d5a7881e 100644 (file)
--- a/altoslib/AltosDataListener.java
+++ b/altoslib/AltosDataListener.java
@@ -16,9 +16,9 @@ package org.altusmetrum.altoslib_11;
 
 public abstract class AltosDataListener {
 
-       public AltosCalData     cal_data;
-
-       public double   time = AltosLib.MISSING;
+       public AltosCalData     cal_data = null;
+       public double           time = AltosLib.MISSING;
+       public int              state = AltosLib.MISSING;
 
        public void set_time(double time) {
                if (time != AltosLib.MISSING)
@@ -29,13 +29,15 @@ public abstract class AltosDataListener {
                return time;
        }
 
-       public int      state = AltosLib.MISSING;
-
        public void set_state(int state) {
                if (state != AltosLib.MISSING)
                        this.state = state;
        }
 
+       /* Called after all records are captured */
+       public void finish() {
+       }
+
        public abstract void set_rssi(int rssi, int status);
        public abstract void set_received_time(long received_time);
 
@@ -59,10 +61,13 @@ public abstract class AltosDataListener {
        public abstract void set_accel(double along, double across, double through);
        public abstract void set_mag(double along, double across, double through);
        public abstract void set_pyro_voltage(double volts);
-       public abstract void set_ignitor_voltage(double[] voltage);
+       public abstract void set_igniter_voltage(double[] voltage);
        public abstract void set_pyro_fired(int pyro_mask);
        public abstract void set_companion(AltosCompanion companion);
 
+       public AltosDataListener() {
+       }
+
        public AltosDataListener(AltosCalData cal_data) {
                this.cal_data = cal_data;
        }