altoslib: Finish AltosState changes. Update version number.

Removes all of the AltosRecord bits, changes the monitor idle bits to
have per-object state updaters.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 47 insertions, 1 deletions

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index cb6826f3..56add8f3 100644
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.java
@@ -15,13 +15,29 @@
  * 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 AltosMag implements Cloneable {
 	public int		x;
 	public int		y;
 	public int		z;
 
+	public boolean parse_string(String line) {
+		if (!line.startsWith("X:"))
+			return false;
+
+		String[] items = line.split("\\s+");
+
+		if (items.length >= 6) {
+			x = Integer.parseInt(items[1]);
+			y = Integer.parseInt(items[3]);
+			z = Integer.parseInt(items[5]);
+		}
+		return true;
+	}
+
 	public AltosMag clone() {
 		AltosMag n = new AltosMag();
 
@@ -30,5 +46,35 @@ public class AltosMag implements Cloneable {
 		n.z = z;
 		return n;
 	}
+
+	public AltosMag() {
+		x = AltosLib.MISSING;
+		y = AltosLib.MISSING;
+		z = AltosLib.MISSING;
+	}
+
+	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+		try {
+			AltosMag	mag = new AltosMag(link);
+
+			if (mag != null)
+				state.set_mag(mag);
+		} catch (TimeoutException te) {
+		} catch (InterruptedException ie) {
+		}
+	}
+
+	public AltosMag(AltosLink link) throws InterruptedException, TimeoutException {
+		this();
+		link.printf("M\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