X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIMU.java;h=20a2a413da4f9499a7f1ce052dd52f882440b0c9;hp=89d7def4a3bb2066b5ff1adbdd364107dd575ad3;hb=78b4bf77fca96bef2cce443ad4c9544ae83f0acc;hpb=c8078d352a7f54a4a97d25af080155d3f875536a

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index 89d7def4..20a2a413 100644
--- a/altoslib/AltosIMU.java
+++ b/altoslib/AltosIMU.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,41 +16,30 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
 
 import java.util.concurrent.*;
+import java.io.*;
 
 public class AltosIMU implements Cloneable {
-	public double		accel_x;
-	public double		accel_y;
-	public double		accel_z;
+	public int		accel_along;
+	public int		accel_across;
+	public int		accel_through;
 
-	public double		gyro_x;
-	public double		gyro_y;
-	public double		gyro_z;
+	public int		gyro_roll;
+	public int		gyro_pitch;
+	public int		gyro_yaw;
 
-/*
- * XXX use ground measurements to adjust values
-
-	public double		ground_accel_x;
-	public double		ground_accel_y;
-	public double		ground_accel_z;
-
-	public double		ground_gyro_x;
-	public double		ground_gyro_y;
-	public double		ground_gyro_z;
-*/
+	public static final double	counts_per_g = 2048.0;
 
-	public static int	counts_per_g = 2048;
-
-	public static double convert_accel(int counts) {
-		return (double) counts / (double) counts_per_g * (-AltosConvert.GRAVITATIONAL_ACCELERATION);
+	public static double convert_accel(double counts) {
+		return counts / counts_per_g * AltosConvert.gravity;
 	}
 
-	public static double	counts_per_degsec = 16.4;
+	public static final double	counts_per_degsec = 16.4;
 
-	public static double convert_gyro(int counts) {
-		return (double) counts / counts_per_degsec;
+	public static double convert_gyro(double counts) {
+		return counts / counts_per_degsec;
 	}
 
 	public boolean parse_string(String line) {
@@ -59,12 +49,12 @@ public class AltosIMU implements Cloneable {
 		String[] items = line.split("\\s+");
 
 		if (items.length >= 8) {
-			accel_x = convert_accel(Integer.parseInt(items[1]));
-			accel_y = convert_accel(Integer.parseInt(items[2]));
-			accel_z = convert_accel(Integer.parseInt(items[3]));
-			gyro_x = convert_gyro(Integer.parseInt(items[5]));
-			gyro_y = convert_gyro(Integer.parseInt(items[6]));
-			gyro_z = convert_gyro(Integer.parseInt(items[7]));
+			accel_along = Integer.parseInt(items[1]);
+			accel_across = Integer.parseInt(items[2]);
+			accel_through = Integer.parseInt(items[3]);
+			gyro_roll = Integer.parseInt(items[5]);
+			gyro_pitch = Integer.parseInt(items[6]);
+			gyro_yaw = Integer.parseInt(items[7]);
 		}
 		return true;
 	}
@@ -72,34 +62,52 @@ public class AltosIMU implements Cloneable {
 	public AltosIMU clone() {
 		AltosIMU	n = new AltosIMU();
 
-		n.accel_x = accel_x;
-		n.accel_y = accel_y;
-		n.accel_z = accel_z;
+		n.accel_along = accel_along;
+		n.accel_across = accel_across;
+		n.accel_through = accel_through;
 
-		n.gyro_x = gyro_x;
-		n.gyro_y = gyro_y;
-		n.gyro_z = gyro_z;
+		n.gyro_roll = gyro_roll;
+		n.gyro_pitch = gyro_pitch;
+		n.gyro_yaw = gyro_yaw;
 		return n;
 	}
 
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+	static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
 		try {
 			AltosIMU	imu = new AltosIMU(link);
 
-			if (imu != null)
-				state.set_imu(imu);
+			if (imu != null) {
+				listener.set_accel(cal_data.accel_along(imu.accel_along),
+						   cal_data.accel_across(imu.accel_across),
+						   cal_data.accel_through(imu.accel_through));
+				listener.set_gyro(cal_data.gyro_roll(imu.gyro_roll),
+						  cal_data.gyro_pitch(imu.gyro_pitch),
+						  cal_data.gyro_yaw(imu.gyro_yaw));
+			}
 		} catch (TimeoutException te) {
 		}
 	}
 
 	public AltosIMU() {
-		accel_x = AltosLib.MISSING;
-		accel_y = AltosLib.MISSING;
-		accel_z = AltosLib.MISSING;
+		accel_along = AltosLib.MISSING;
+		accel_across = AltosLib.MISSING;
+		accel_through = AltosLib.MISSING;
+
+		gyro_roll = AltosLib.MISSING;
+		gyro_pitch = AltosLib.MISSING;
+		gyro_yaw = AltosLib.MISSING;
+	}
+
+	public AltosIMU(int accel_along, int accel_across, int accel_through,
+			int gyro_roll, int gyro_pitch, int gyro_yaw) {
+
+		this.accel_along = accel_along;
+		this.accel_across = accel_across;
+		this.accel_through = accel_through;
 
-		gyro_x = AltosLib.MISSING;
-		gyro_y = AltosLib.MISSING;
-		gyro_z = AltosLib.MISSING;
+		this.gyro_roll = gyro_roll;
+		this.gyro_pitch = gyro_pitch;
+		this.gyro_yaw = gyro_yaw;
 	}
 
 	public AltosIMU(AltosLink link) throws InterruptedException, TimeoutException {