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

diff --git a/altoslib/AltosMma655x.java b/altoslib/AltosMma655x.java
index 8dc947db..3a728ac4 100644
--- a/altoslib/AltosMma655x.java
+++ b/altoslib/AltosMma655x.java
@@ -3,7 +3,8 @@
  *
  * 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.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,22 +16,23 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_13;
 
 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 +46,32 @@ public class AltosMma655x implements Cloneable {
 		return n;
 	}
 
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+	static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, AltosUnknownProduct {
 		try {
 			AltosMma655x	mma655x = new AltosMma655x(link);
+			AltosCalData	cal_data = listener.cal_data();
 
-			if (mma655x != null)
-				state.set_accel(mma655x.accel);
+			if (mma655x != null) {
+				int accel = mma655x.accel;
+				if (cal_data.mma655x_inverted)
+					accel = 4095 - accel;
+				if (cal_data.pad_orientation == 1)
+					accel = 4095 - accel;
+				listener.set_acceleration(cal_data.acceleration(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;
 		}
 	}