Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosMma655x.java

diff --git a/altoslib/AltosMma655x.java b/altoslib/AltosMma655x.java
index a24e76bdc418731d20ef0b23522ca4cccb8a9e62..503eb5fd0808e597424ac2df60769d060f4866af 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,13 +16,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_11;
 
 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,18 @@ public class AltosMma655x implements Cloneable {
                return n;
        }
 
-       static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+       static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException, AltosUnknownProduct {
                try {
                        AltosMma655x    mma655x = new AltosMma655x(link);
 
-                       if (mma655x != null)
-                               state.set_accel(mma655x.accel);
+                       if (mma655x != null) {
+                               int accel = mma655x.accel;
+                               if (config_data.mma655x_inverted())
+                                       accel = 4095 - accel;
+                               if (config_data.pad_orientation == 1)
+                                       accel = 4095 - accel;
+                               state.set_accel(accel);
+                       }
                } catch (TimeoutException te) {
                } catch (NumberFormatException ne) {
                }