From 1783207a559a0fdeb431a38c42f005e3841e9675 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 17 Nov 2012 17:34:01 -0800 Subject: [PATCH] altoslib: Force ms5611 mode Signed-off-by: Keith Packard --- altoslib/AltosMs5607.java | 12 ++++++++++-- 1 file 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); -- 2.30.2