altoslib: Force ms5611 mode

[fw/altos] / altoslib / AltosMs5607.java

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 253e2f9bb5162e0321c0a4ee729bae3068d19a79..3a30fc74dcf66e46bb01a85a94013bee973dc16e 100644 (file)
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altoslib;
+package org.altusmetrum.AltosLib;
 
 public class AltosMs5607 {
        public int      reserved;
@@ -32,20 +32,28 @@ public class AltosMs5607 {
        public int      pa;
        public int      cc;
 
+       static final boolean    ms5611 = true;
+
        void convert() {
                int     dT;
                int TEMP;
                long OFF;
                long SENS;
-               int P;
+               //int P;
 
                dT = raw_temp - ((int) tref << 8);
        
                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);
@@ -73,4 +81,11 @@ public class AltosMs5607 {
                convert();
                return pa;
        }
+
+       public AltosMs5607() {
+               raw_pres = AltosRecord.MISSING;
+               raw_temp = AltosRecord.MISSING;
+               pa = AltosRecord.MISSING;
+               cc = AltosRecord.MISSING;
+       }
 }