altoslib: Add support for MicroPeak v2 eeprom format

[fw/altos] / altoslib / AltosDataListener.java

diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java
index fb37fe3d6453229fa1d107fae80c616272ef2871..496235c3c843fa5f2595a6b74d7f12ced91f35bc 100644 (file)
--- a/altoslib/AltosDataListener.java
+++ b/altoslib/AltosDataListener.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
  * General Public License for more details.
  */
 

-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_13;

 
 public abstract class AltosDataListener {
 
 
 public abstract class AltosDataListener {
 


@@ -21,7 +21,14 @@ public abstract class AltosDataListener {
        public double           time = AltosLib.MISSING;
        public double           frequency = AltosLib.MISSING;
 
        public double           time = AltosLib.MISSING;
        public double           frequency = AltosLib.MISSING;
 

+       public int              raw_tick = AltosLib.MISSING;
+
+       public int tick() {
+               return raw_tick;
+       }
+

        public void set_tick(int tick) {
        public void set_tick(int tick) {

+               raw_tick = tick;

                cal_data.set_tick(tick);
                set_time(cal_data.time());
        }
                cal_data.set_tick(tick);
                set_time(cal_data.time());
        }


@@ -79,6 +86,9 @@ public abstract class AltosDataListener {
                this.frequency = frequency;
        }
 
                this.frequency = frequency;
        }
 

+       public void set_avoid_duplicate_files() {
+       }
+

        /* Called after all records are captured */
        public void finish() {
        }
        /* Called after all records are captured */
        public void finish() {
        }


@@ -104,7 +114,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_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) {
+               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);
 
        public abstract void set_orient(double orient);
        public abstract void set_gyro(double roll, double pitch, double yaw);