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

diff --git a/altoslib/AltosMma655x.java b/altoslib/AltosMma655x.java
index 7f0dab98..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,13 +16,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+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) throws NumberFormatException {
 		if (line.startsWith("MMA655X value")) {
@@ -45,12 +46,19 @@ public class AltosMma655x implements Cloneable {
 		return n;
 	}
 
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+	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 (NumberFormatException ne) {
 		}