X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMma655x.java;h=1a730c11780bd0de5533c6de8d5619f87f949977;hb=4e237bd43fef1858f88ff8f8750759e16442ea7e;hp=2aadfc2e0e926a0d501c1559851c984655ea05d2;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859;p=fw%2Faltos

diff --git a/altoslib/AltosMma655x.java b/altoslib/AltosMma655x.java
index 2aadfc2e..1a730c11 100644
--- a/altoslib/AltosMma655x.java
+++ b/altoslib/AltosMma655x.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_14;
 
 import java.util.concurrent.*;
 
@@ -46,15 +46,16 @@ public class AltosMma655x implements Cloneable {
 		return n;
 	}
 
-	static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException, AltosUnknownProduct {
+	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) {
 				int accel = mma655x.accel;
 				if (cal_data.mma655x_inverted)
 					accel = 4095 - accel;
-				if (cal_data.pad_orientation == 1)
+				if (cal_data.pad_orientation == AltosLib.AO_PAD_ORIENTATION_ANTENNA_DOWN)
 					accel = 4095 - accel;
 				listener.set_acceleration(cal_data.acceleration(accel));
 			}