X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosIMU.java;h=672c611172929115724b0382a977beeba5b1a4d6;hb=7175774c4f60ed3efd54417f2035b50ea0108c7b;hp=8f6731faa5a9bebbbbf1712d0502a4bf4d471042;hpb=bf88c5f829ea5d32043431945e862a9f6c96740a;p=fw%2Faltos

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index 8f6731fa..672c6111 100644
--- a/altoslib/AltosIMU.java
+++ b/altoslib/AltosIMU.java
@@ -15,15 +15,135 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_11;
 
-public class AltosIMU {
-	public int		accel_x;
-	public int		accel_y;
-	public int		accel_z;
+import java.util.concurrent.*;
+import java.io.*;
 
-	public int		gyro_x;
-	public int		gyro_y;
-	public int		gyro_z;
+public class AltosIMU implements Cloneable, AltosJsonable {
+	public int		accel_along;
+	public int		accel_across;
+	public int		accel_through;
+
+	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:"))
+			return false;
+
+		String[] items = line.split("\\s+");
+
+		if (items.length >= 8) {
+			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;
+	}
+
+	public AltosIMU clone() {
+		AltosIMU	n = new AltosIMU();
+
+		n.accel_along = accel_along;
+		n.accel_across = accel_across;
+		n.accel_through = accel_through;
+
+		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 {
+		try {
+			AltosIMU	imu = new AltosIMU(link);
+
+			if (imu != null)
+				state.set_imu(imu);
+		} catch (TimeoutException te) {
+		}
+	}
+
+	public AltosIMU() {
+		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;
+
+		this.gyro_roll = gyro_roll;
+		this.gyro_pitch = gyro_pitch;
+		this.gyro_yaw = gyro_yaw;
+	}
+
+	public AltosIMU(AltosLink link) throws InterruptedException, TimeoutException {
+		this();
+		link.printf("I\n");
+		for (;;) {
+			String line = link.get_reply_no_dialog(5000);
+			if (line == null) {
+				throw new TimeoutException();
+			}
+			if (parse_string(line))
+				break;
+		}
+	}
+
+	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 fromJson(AltosJson j, AltosIMU def) {
+		if (j == null)
+			return def;
+		return new AltosIMU(j);
+	}
+
+	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;
+	}
 }
-	
\ No newline at end of file