X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIMU.java;h=c231dda74c6f8f9cc2a76c1a8e123478e2d9a232;hp=46df35bf12c1428cfa7ac23f065dc0e4017ae052;hb=6aa99c160f0695eb25ccc0598e4c36224c89dab4;hpb=04d7d0f829ba953ffeca8ad9887a4b6b2b5d5087

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index 46df35bf..c231dda7 100644
--- a/altoslib/AltosIMU.java
+++ b/altoslib/AltosIMU.java
@@ -15,7 +15,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
+
+import java.util.concurrent.*;
 
 public class AltosIMU implements Cloneable {
 	public int		accel_x;
@@ -26,6 +28,23 @@ public class AltosIMU implements Cloneable {
 	public int		gyro_y;
 	public int		gyro_z;
 
+	public boolean parse_string(String line) {
+		if (!line.startsWith("Accel:"))
+			return false;
+
+		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]);
+		}
+		return true;
+	}
+
 	public AltosIMU clone() {
 		AltosIMU	n = new AltosIMU();
 
@@ -37,5 +56,39 @@ public class AltosIMU implements Cloneable {
 		n.gyro_y = gyro_y;
 		n.gyro_z = gyro_z;
 		return n;
+	}
+
+	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+		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;
+
+		gyro_x = AltosLib.MISSING;
+		gyro_y = AltosLib.MISSING;
+		gyro_z = AltosLib.MISSING;
+	}
+
+	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;
+		}
+	}
 }
-	
\ No newline at end of file