add sox as another build dep

[fw/altos] / altoslib / AltosDataListener.java

diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java
index 359d04c932008993238474a14266bb0ce5ca241a..18ffd988299a63cb2821d1c0eae5df6221f016dd 100644 (file)
--- a/altoslib/AltosDataListener.java
+++ b/altoslib/AltosDataListener.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_14;
 
 public abstract class AltosDataListener {
 
@@ -39,6 +39,10 @@ public abstract class AltosDataListener {
                return cal_data;
        }
 
+       public AltosConfigData config_data() {
+               return null;
+       }
+
        public void set_time(double time) {
                if (time != AltosLib.MISSING)
                        this.time = time;
@@ -59,6 +63,8 @@ public abstract class AltosDataListener {
 
        public void set_log_format(int log_format) {
                cal_data().set_log_format(log_format);
+               if (cal_data().device_type == AltosLib.MISSING)
+                       cal_data().set_device_type(AltosLib.product_id_from_log_format(log_format));
                switch (log_format) {
                case AltosLib.AO_LOG_FORMAT_TELEGPS:
                        set_state(AltosLib.ao_flight_stateless);
@@ -70,6 +76,10 @@ public abstract class AltosDataListener {
                return time;
        }
 
+       public String state_name() {
+               return cal_data().state_name();
+       }
+
        public void set_state(int state) {
                cal_data().set_state(state);
        }
@@ -86,6 +96,9 @@ public abstract class AltosDataListener {
                this.frequency = frequency;
        }
 
+       public void set_avoid_duplicate_files() {
+       }
+
        /* Called after all records are captured */
        public void finish() {
        }
@@ -111,7 +124,18 @@ public abstract class AltosDataListener {
        public abstract void set_apogee_voltage(double volts);
        public abstract void set_main_voltage(double volts);
 
-       public abstract void set_gps(AltosGPS gps);
+       public void set_gps(AltosGPS gps, boolean set_location, boolean set_sats) {
+               AltosCalData cal_data = cal_data();
+               cal_data.set_cal_gps(gps);
+       }
+
+       public AltosGPS make_temp_gps(boolean sats) {
+               return cal_data().make_temp_cal_gps(tick(), sats);
+       }
+
+       public AltosGPS temp_gps() {
+               return cal_data().temp_cal_gps();
+       }
 
        public abstract void set_orient(double orient);
        public abstract void set_gyro(double roll, double pitch, double yaw);
@@ -122,6 +146,7 @@ public abstract class AltosDataListener {
        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 abstract void set_motor_pressure(double motor_pressure);
 
        public AltosDataListener() {
        }