X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosIMU.java;h=ecc02f15b5d2dda6e7b8c62be7027eff2984e7dd;hb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b;hp=c231dda74c6f8f9cc2a76c1a8e123478e2d9a232;hpb=488a527267decece48e6682e0e0c7fc29cbed329;p=fw%2Faltos

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index c231dda7..ecc02f15 100644
--- a/altoslib/AltosIMU.java
+++ b/altoslib/AltosIMU.java
@@ -15,18 +15,31 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_11;
 
 import java.util.concurrent.*;
+import java.io.*;
 
-public class AltosIMU implements Cloneable {
-	public int		accel_x;
-	public int		accel_y;
-	public int		accel_z;
+public class AltosIMU implements Cloneable, AltosHashable, AltosJsonable {
+	public int		accel_along;
+	public int		accel_across;
+	public int		accel_through;
 
-	public int		gyro_x;
-	public int		gyro_y;
-	public int		gyro_z;
+	public int		gyro_roll;
+	public int		gyro_pitch;
+	public int		gyro_yaw;
+
+	public static final double	counts_per_g = 2048.0;
+
+	public static double convert_accel(double counts) {
+		return counts / counts_per_g * (-AltosConvert.GRAVITATIONAL_ACCELERATION);
+	}
+
+	public static final double	counts_per_degsec = 16.4;
+
+	public static double convert_gyro(double counts) {
+		return counts / counts_per_degsec;
+	}
 
 	public boolean parse_string(String line) {
 		if (!line.startsWith("Accel:"))
@@ -35,12 +48,12 @@ public class AltosIMU implements Cloneable {
 		String[] items = line.split("\\s+");
 
 		if (items.length >= 8) {
-			accel_x = Integer.parseInt(items[1]);
-			accel_y = Integer.parseInt(items[2]);
-			accel_z = Integer.parseInt(items[3]);
-			gyro_x = Integer.parseInt(items[5]);
-			gyro_y = Integer.parseInt(items[6]);
-			gyro_z = 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;
 	}
@@ -48,35 +61,46 @@ 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) {
+	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
 		try {
 			AltosIMU	imu = new AltosIMU(link);
 
 			if (imu != null)
 				state.set_imu(imu);
 		} catch (TimeoutException te) {
-		} catch (InterruptedException ie) {
 		}
 	}
 
 	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;
+	}
 
-		gyro_x = AltosLib.MISSING;
-		gyro_y = AltosLib.MISSING;
-		gyro_z = 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;
+
+		this.gyro_roll = gyro_roll;
+		this.gyro_pitch = gyro_pitch;
+		this.gyro_yaw = gyro_yaw;
 	}
 
 	public AltosIMU(AltosLink link) throws InterruptedException, TimeoutException {
@@ -91,4 +115,66 @@ public class AltosIMU implements Cloneable {
 				break;
 		}
 	}
+
+	public AltosIMU (AltosHashSet h) {
+		this();
+
+		accel_along = h.getInt("accel_along", accel_along);
+		accel_across = h.getInt("accel_across", accel_across);
+		accel_through = h.getInt("accel_through", accel_through);
+
+		gyro_roll = h.getInt("gyro_roll", gyro_roll);
+		gyro_pitch = h.getInt("gyro_pitch", gyro_pitch);
+		gyro_yaw = h.getInt("gyro_yaw", gyro_yaw);
+	}
+
+	public AltosIMU (AltosJson j) {
+		this();
+
+		accel_along = j.get_int("accel_along", accel_along);
+		accel_across = j.get_int("accel_across", accel_across);
+		accel_through = j.get_int("accel_through", accel_through);
+
+		gyro_roll = j.get_int("gyro_roll", gyro_roll);
+		gyro_pitch = j.get_int("gyro_pitch", gyro_pitch);
+		gyro_yaw = j.get_int("gyro_yaw", gyro_yaw);
+	}
+
+	static public AltosIMU fromHashSet(AltosHashSet h, AltosIMU def) {
+		if (h == null)
+			return def;
+		return new AltosIMU(h);
+	}
+
+	static public AltosIMU fromJson(AltosJson j, AltosIMU def) {
+		if (j == null)
+			return def;
+		return new AltosIMU(j);
+	}
+
+	public AltosHashSet hashSet() {
+		AltosHashSet	h = new AltosHashSet();
+
+		h.putInt("accel_along", accel_along);
+		h.putInt("accel_across", accel_across);
+		h.putInt("accel_through", accel_through);
+
+		h.putInt("gyro_roll", gyro_roll);
+		h.putInt("gyro_pitch", gyro_pitch);
+		h.putInt("gyro_yaw", gyro_yaw);
+		return h;
+	}
+
+	public AltosJson json() {
+		AltosJson	j = new AltosJson();
+
+		j.put("accel_along", accel_along);
+		j.put("accel_across", accel_across);
+		j.put("accel_through", accel_through);
+
+		j.put("gyro_roll", gyro_roll);
+		j.put("gyro_pitch", gyro_pitch);
+		j.put("gyro_yaw", gyro_yaw);
+		return j;
+	}
 }