X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosCalData.java;h=22d19def1ba9397fbdec3ab510131407afe8bdf8;hp=fdea5e214948da1bdad80f60ad43cc8c9fde0475;hb=9791ebb256c2892663c072f7989e4b9bd34818a1;hpb=749400fd244eba38806c623d2a35722642230698

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index fdea5e21..22d19def 100644
--- 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
@@ -133,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) {
@@ -142,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;
@@ -241,6 +255,8 @@ public class AltosCalData {
 
 	public AltosGPS		gps_pad = null;
 
+	public AltosGPS		prev_gps = null;
+
 	public double		gps_pad_altitude = AltosLib.MISSING;
 
 	public void set_cal_gps(AltosGPS gps) {
@@ -251,6 +267,7 @@ public class AltosCalData {
 				gps_pad_altitude = gps.alt;
 		}
 		temp_gps = null;
+		prev_gps = gps;
 	}
 
 	/*
@@ -275,7 +292,7 @@ public class AltosCalData {
 
 	public AltosGPS make_temp_cal_gps(int tick, boolean sats) {
 		if (temp_gps == null)
-			temp_gps = new AltosGPS();
+			temp_gps = new AltosGPS(prev_gps);
 		if (sats) {
 			if (tick != temp_gps_sat_tick)
 				temp_gps.cc_gps_sat = null;
@@ -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);
 	}
 }