diff options
author | Keith Packard <keithp@keithp.com> | 2016-05-02 16:13:53 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2016-05-02 16:18:54 -0700 |
commit | 0b0b359cbce6b818257b44b2a6aee0edcbaee40d (patch) | |
tree | 38840d0a2addfdaa00bbd46a8980f6e31066afe0 /altoslib/AltosMma655x.java | |
parent | 1a797f5fd5d25ba635fd79ad7604763253caabf2 (diff) |
altoslib: Deal with TeleMetrum v2.0 MMA6555 being inverted
Dumping the MMA655X data with the 'A' command provides the raw sensor
value. On TM v2.0 boards, the sensor is inverted, and all of the
firmware uses the inverted value except for the 'dump the raw data'
command. As a result, MonitorIdle was using the un-inverted value and
displaying mystic values.
I've fixed this in the ground station code by checking the product
name and conditionally inverting the value (4095 - value) for
TeleMetrum v2.0 products. Unknown products will generate a warning
dialog on AltosUI so we'll catch places where we've failed to add a
new product name.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosMma655x.java')
-rw-r--r-- | altoslib/AltosMma655x.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/altoslib/AltosMma655x.java b/altoslib/AltosMma655x.java index da57c27f..b09ec74b 100644 --- a/altoslib/AltosMma655x.java +++ b/altoslib/AltosMma655x.java @@ -21,7 +21,7 @@ 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 +45,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) { } |