Merge branch 'branch-1.3' into debian

Conflicts:
	ChangeLog
	altoslib/AltosRecordMM.java
	altosui/Makefile.am
	altosui/altos-windows.nsi.in
	configure.ac
	debian/changelog
	debian/control
	doc/Makefile
	doc/altusmetrum.xsl
	doc/release-notes-1.2.1.xsl
	doc/release-notes-1.2.xsl

1 files changed, 68 insertions, 0 deletions

diff --git a/altoslib/AltosMma655x.java b/altoslib/AltosMma655x.java
new file mode 100644
index 00000000..f8256190
--- /dev/null
+++ b/altoslib/AltosMma655x.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_2;
+
+import java.util.concurrent.*;
+
+public class AltosMma655x implements Cloneable {
+
+	int	accel;
+
+	public boolean parse_line(String line) {
+		String[] items = line.split("\\s+");
+		if (line.startsWith("MMA655X value:")) {
+			if (items.length >= 3)
+				accel = Integer.parseInt(items[1]);
+		} else
+			return false;
+		return true;
+	}
+
+	public AltosMma655x() {
+		accel = AltosLib.MISSING;
+	}
+
+	public AltosMma655x clone() {
+		AltosMma655x	n = new AltosMma655x();
+
+		n.accel = accel;
+		return n;
+	}
+
+	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+		try {
+			AltosMma655x	mma655x = new AltosMma655x(link);
+
+			if (mma655x != null)
+				state.set_accel(mma655x.accel);
+		} catch (TimeoutException te) {
+		}
+	}
+
+	public AltosMma655x(AltosLink link) throws InterruptedException, TimeoutException {
+		this();
+		link.printf("A\n");
+		for (;;) {
+			String line = link.get_reply_no_dialog(5000);
+			if (line == null)
+				throw new TimeoutException();
+			if (!parse_line(line))
+				break;
+		}
+	}
+}