X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosCalData.java;fp=altoslib%2FAltosCalData.java;h=c3d79250a6e54cb23e25a2fb870e988f16dccce5;hp=d448fdfe5d468edc586d8d61c23dcd0a9f71cae7;hb=1e4b8674d874a190eca1a98a397aaf0a9d15bda1;hpb=3fd320ea38f2945f5611a09a0e48d16db467d105

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index d448fdfe..c3d79250 100644
--- a/altoslib/AltosCalData.java
+++ b/altoslib/AltosCalData.java
@@ -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,11 @@ 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);
+		System.out.printf("acceleration %g (+ %g - %g g %g) -> %g\n",
+				  sensor, accel_plus_g, accel_minus_g, ground_accel, accel);
+		return accel;
 	}
 
 	public AltosMs5607	ms5607 = null;
@@ -404,6 +420,14 @@ public class AltosCalData {
 			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);
 	}
 }