altos/telefireone-v2.0: Remove build of ao_product.h from Makefile

[fw/altos] / altoslib / AltosMma655x.java

diff --git a/altoslib/AltosMma655x.java b/altoslib/AltosMma655x.java
index b09ec74b250e4a46c2cf377768130f2f15282af2..3a728ac4d3f6092af73c3301c8316f7340d315df 100644 (file)
--- 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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_10;
+package org.altusmetrum.altoslib_13;
 
 import java.util.concurrent.*;
 
@@ -45,17 +46,18 @@ public class AltosMma655x implements Cloneable {
                return n;
        }
 
-       static public void update_state(AltosState state, AltosLink link, AltosConfigData config_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 (config_data.mma655x_inverted())
+                               if (cal_data.mma655x_inverted)
                                        accel = 4095 - accel;
-                               if (config_data.pad_orientation == 1)
+                               if (cal_data.pad_orientation == 1)
                                        accel = 4095 - accel;
-                               state.set_accel(accel);
+                               listener.set_acceleration(cal_data.acceleration(accel));
                        }
                } catch (TimeoutException te) {
                } catch (NumberFormatException ne) {