projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Deliver firmware for Tmega 2.0 and TBT 3.0 for Windows too
[fw/altos]
/
altoslib
/
AltosMma655x.java
diff --git
a/altoslib/AltosMma655x.java
b/altoslib/AltosMma655x.java
index a24e76bdc418731d20ef0b23522ca4cccb8a9e62..57bc7b9163d9ecda3c43f3dc7f7a728b967261da 100644
(file)
--- a/
altoslib/AltosMma655x.java
+++ b/
altoslib/AltosMma655x.java
@@
-15,13
+15,13
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 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 {
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")) {
public boolean parse_line(String line) throws NumberFormatException {
if (line.startsWith("MMA655X value")) {
@@
-45,12
+45,18
@@
public class AltosMma655x implements Cloneable {
return n;
}
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);
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) {
}
} catch (TimeoutException te) {
} catch (NumberFormatException ne) {
}