altoslib: Do data analysis on raw values rather than AltosState

[fw/altos] / altoslib / AltosMma655x.java

diff --git a/altoslib/AltosMma655x.java b/altoslib/AltosMma655x.java
index 503eb5fd0808e597424ac2df60769d060f4866af..2aadfc2e0e926a0d501c1559851c984655ea05d2 100644 (file)
--- a/altoslib/AltosMma655x.java
+++ b/altoslib/AltosMma655x.java
@@ -46,17 +46,17 @@ 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, AltosCalData cal_data) throws InterruptedException, AltosUnknownProduct {
                try {
                        AltosMma655x    mma655x = new AltosMma655x(link);
 
                        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) {