diff options
| author | Keith Packard <keithp@keithp.com> | 2012-11-17 17:34:01 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-11-17 17:34:01 -0800 |
| commit | 1783207a559a0fdeb431a38c42f005e3841e9675 (patch) | |
| tree | ab1b781b5d06f6de6982948dd17f8a3bbc2b0ec6 | |
| parent | 0606dc013d8b89fd5de0548af0de20fdab5c27d4 (diff) | |
altoslib: Force ms5611 modealtosui-ms5611
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altoslib/AltosMs5607.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java index 268e89f6..3a30fc74 100644 --- a/altoslib/AltosMs5607.java +++ b/altoslib/AltosMs5607.java @@ -32,6 +32,8 @@ public class AltosMs5607 { public int pa; public int cc; + static final boolean ms5611 = true; + void convert() { int dT; int TEMP; @@ -43,9 +45,15 @@ public class AltosMs5607 { TEMP = (int) (2000 + (((long) dT * tempsens) >> 23)); - OFF = ((long) off << 17) + (((long) tco * dT) >> 6); + if (ms5611) { + OFF = ((long) off << 16) + (((long) tco * dT) >> 7); + + SENS = ((long) sens << 15) + (((long) tcs * dT) >> 8); + } else { + OFF = ((long) off << 17) + (((long) tco * dT) >> 6); - SENS = ((long) sens << 16) + (((long) tcs * dT) >> 7); + SENS = ((long) sens << 16) + (((long) tcs * dT) >> 7); + } if (TEMP < 2000) { int T2 = (int) (((long) dT * (long) dT) >> 31); |