X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMma655x.java;h=b09ec74b250e4a46c2cf377768130f2f15282af2;hb=f078235803a80403014b3e54039fd2d0e0704367;hp=8dc947dbab804d900ba9d399c8e022676dac0124;hpb=488a527267decece48e6682e0e0c7fc29cbed329;p=fw%2Faltos

diff --git a/altoslib/AltosMma655x.java b/altoslib/AltosMma655x.java
index 8dc947db..b09ec74b 100644
--- a/altoslib/AltosMma655x.java
+++ b/altoslib/AltosMma655x.java
@@ -15,22 +15,23 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_10;
 
 import java.util.concurrent.*;
 
 public class AltosMma655x implements Cloneable {
 
-	int	accel;
+	private 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 boolean parse_line(String line) throws NumberFormatException {
+		if (line.startsWith("MMA655X value")) {
+			String[] items = line.split("\\s+");
+			if (items.length >= 3) {
+				accel = Integer.parseInt(items[2]);
+				return true;
+			}
+		}
+		return false;
 	}
 
 	public AltosMma655x() {
@@ -44,25 +45,31 @@ public class AltosMma655x implements Cloneable {
 		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, AltosUnknownProduct {
 		try {
 			AltosMma655x	mma655x = new AltosMma655x(link);
 
-			if (mma655x != null)
-				state.set_accel(mma655x.accel);
+			if (mma655x != null) {
+				int accel = mma655x.accel;
+				if (config_data.mma655x_inverted())
+					accel = 4095 - accel;
+				if (config_data.pad_orientation == 1)
+					accel = 4095 - accel;
+				state.set_accel(accel);
+			}
 		} catch (TimeoutException te) {
-		} catch (InterruptedException ie) {
+		} catch (NumberFormatException ne) {
 		}
 	}
 
-	public AltosMma655x(AltosLink link) throws InterruptedException, TimeoutException {
+	public AltosMma655x(AltosLink link) throws InterruptedException, TimeoutException, NumberFormatException {
 		this();
 		link.printf("A\n");
 		for (;;) {
 			String line = link.get_reply_no_dialog(5000);
 			if (line == null)
 				throw new TimeoutException();
-			if (!parse_line(line))
+			if (parse_line(line))
 				break;
 		}
 	}