altoslib: Remove spurious debug printf in AltosCalData

[fw/altos] / altoslib / AltosCalData.java

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index b49e3792fad00074316191d91a51a9346db5ab3c..22d19def1ba9397fbdec3ab510131407afe8bdf8 100644 (file)
--- a/altoslib/AltosCalData.java
+++ b/altoslib/AltosCalData.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_13;
 
 /*
  * Calibration and other data needed to construct 'real' values from various data
@@ -72,6 +72,13 @@ public class AltosCalData {
                }
        }
 
+       public int              log_format = AltosLib.MISSING;
+
+       public void set_log_format(int log_format) {
+               if (log_format != AltosLib.MISSING)
+                       this.log_format = log_format;
+       }
+
        public int              config_major = AltosLib.MISSING;
        public int              config_minor = AltosLib.MISSING;
        public int              flight_log_max = AltosLib.MISSING;
@@ -126,6 +133,18 @@ public class AltosCalData {
                mma655x_inverted = inverted;
        }
 
+       public boolean adxl375_inverted = false;
+
+       public void set_adxl375_inverted(boolean inverted) {
+               adxl375_inverted = inverted;
+       }
+
+       public int adxl375_axis = AltosLib.MISSING;
+
+       public void set_adxl375_axis(int axis) {
+               adxl375_axis = axis;
+       }
+
        public int pad_orientation = AltosLib.MISSING;
 
        public void set_pad_orientation(int orientation) {
@@ -135,7 +154,9 @@ public class AltosCalData {
 
        /* Compute acceleration */
        public double acceleration(double sensor) {
-               return AltosConvert.acceleration_from_sensor(sensor, accel_plus_g, accel_minus_g, ground_accel);
+               double accel;
+               accel = AltosConvert.acceleration_from_sensor(sensor, accel_plus_g, accel_minus_g, ground_accel);
+               return accel;
        }
 
        public AltosMs5607      ms5607 = null;
@@ -192,7 +213,6 @@ public class AltosCalData {
                tick = AltosLib.MISSING;
                prev_tick = AltosLib.MISSING;
                temp_gps = null;
-               prev_gps = null;
                temp_gps_sat_tick = AltosLib.MISSING;
                accel = AltosLib.MISSING;
        }
@@ -235,13 +255,19 @@ public class AltosCalData {
 
        public AltosGPS         gps_pad = null;
 
+       public AltosGPS         prev_gps = null;
+
        public double           gps_pad_altitude = AltosLib.MISSING;
 
-       public void set_gps(AltosGPS gps) {
-               if ((state != AltosLib.MISSING && state < AltosLib.ao_flight_boost) || gps_pad == null)
-                       gps_pad = gps;
-               if (gps_pad_altitude == AltosLib.MISSING && gps.alt != AltosLib.MISSING)
-                       gps_pad_altitude = gps.alt;
+       public void set_cal_gps(AltosGPS gps) {
+               if (gps.locked && gps.nsat >= 4) {
+                       if ((state != AltosLib.MISSING && state < AltosLib.ao_flight_boost) || gps_pad == null)
+                               gps_pad = gps;
+                       if (gps_pad_altitude == AltosLib.MISSING && gps.alt != AltosLib.MISSING)
+                               gps_pad_altitude = gps.alt;
+               }
+               temp_gps = null;
+               prev_gps = gps;
        }
 
        /*
@@ -249,33 +275,24 @@ public class AltosCalData {
         * object and then deliver the result atomically to the listener
         */
        AltosGPS                temp_gps = null;
-       AltosGPS                prev_gps = null;
        int                     temp_gps_sat_tick = AltosLib.MISSING;
 
-       public AltosGPS temp_gps() {
+       public AltosGPS temp_cal_gps() {
                return temp_gps;
        }
 
-       public void reset_temp_gps() {
-               if (temp_gps != null) {
-                       if (temp_gps.locked && temp_gps.nsat >= 4)
-                               set_gps(temp_gps);
-                       prev_gps = temp_gps;
-                       temp_gps = null;
-               }
+       public void reset_temp_cal_gps() {
+               if (temp_gps != null)
+                       set_cal_gps(temp_gps);
        }
 
-       public boolean gps_pending() {
+       public boolean cal_gps_pending() {
                return temp_gps != null;
        }
 
-       public AltosGPS make_temp_gps(int tick, boolean sats) {
-               if (temp_gps == null) {
-                       if (prev_gps != null)
-                               temp_gps = prev_gps.clone();
-                       else
-                               temp_gps = new AltosGPS();
-               }
+       public AltosGPS make_temp_cal_gps(int tick, boolean sats) {
+               if (temp_gps == null)
+                       temp_gps = new AltosGPS(prev_gps);
                if (sats) {
                        if (tick != temp_gps_sat_tick)
                                temp_gps.cc_gps_sat = null;
@@ -342,8 +359,8 @@ public class AltosCalData {
                        v = Math.ceil(v);
                else
                        v = Math.floor(v);
-               if (v != 0)
-                       System.out.printf("Adjusting gyro axis by %g steps\n", v);
+//             if (v != 0)
+//                     System.out.printf("Adjusting gyro axis by %g steps\n", v);
                return v * 128.0;
        }
 
@@ -394,13 +411,21 @@ public class AltosCalData {
                set_flight_params(config_data.apogee_delay / ticks_per_sec, config_data.apogee_lockout / ticks_per_sec);
                set_pad_orientation(config_data.pad_orientation);
                set_product(config_data.product);
-               set_accel_plus_minus(config_data.accel_cal_plus, config_data.accel_cal_minus);
+               set_accel_plus_minus(config_data.accel_cal_plus(config_data.pad_orientation), config_data.accel_cal_minus(config_data.pad_orientation));
                set_accel_zero(config_data.accel_zero_along, config_data.accel_zero_across, config_data.accel_zero_through);
                set_ms5607(config_data.ms5607);
                try {
                        set_mma655x_inverted(config_data.mma655x_inverted());
                } catch (AltosUnknownProduct up) {
                }
+               try {
+                       set_adxl375_inverted(config_data.adxl375_inverted());
+               } catch (AltosUnknownProduct up) {
+               }
+               try {
+                       set_adxl375_axis(config_data.adxl375_axis());
+               } catch (AltosUnknownProduct up) {
+               }
                set_pad_orientation(config_data.pad_orientation);
        }
 }