altoslib: Finish AltosState changes. Update version number.

[fw/altos] / altoslib / AltosMs5607.java

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 253e2f9bb5162e0321c0a4ee729bae3068d19a79..b29fa9ae845d11ad4652448f4627587ae062027e 100644 (file)
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -15,7 +15,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altoslib;
+package org.altusmetrum.altoslib_2;
+
+import java.util.concurrent.*;
 
 public class AltosMs5607 {
        public int      reserved;
@@ -32,29 +34,37 @@ public class AltosMs5607 {
        public int      pa;
        public int      cc;
 
+       static final boolean    ms5611 = false;
+
        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));
+               TEMP = (int) (2000 + (((long) dT * (long) tempsens) >> 23));
+
+               if (ms5611) {
+                       OFF = ((long) off << 16) + (((long) tco * (long) dT) >> 7);
 
-               OFF = ((long) off << 17) + (((long) tco * dT) >> 6);
+                       SENS = ((long) sens << 15) + (((long) tcs * (long) dT) >> 8);
+               } else {
+                       OFF = ((long) off << 17) + (((long) tco * (long) dT) >> 6);
 
-               SENS = ((long) sens << 16) + (((long) tcs * dT) >> 7);
+                       SENS = ((long) sens << 16) + (((long) tcs * (long) dT) >> 7);
+               } 
 
                if (TEMP < 2000) {
                        int     T2 = (int) (((long) dT * (long) dT) >> 31);
                        int TEMPM = TEMP - 2000;
-                       long OFF2 = (61 * (long) TEMPM * (long) TEMPM) >> 4;
-                       long SENS2 = 2 * (long) TEMPM * (long) TEMPM;
+                       long OFF2 = ((long) 61 * (long) TEMPM * (long) TEMPM) >> 4;
+                       long SENS2 = (long) 2 * (long) TEMPM * (long) TEMPM;
                        if (TEMP < 1500) {
                                int TEMPP = TEMP + 1500;
-                               long TEMPP2 = TEMPP * TEMPP;
+                               long TEMPP2 = (long) TEMPP * (long) TEMPP;
                                OFF2 = OFF2 + 15 * TEMPP2;
                                SENS2 = SENS2 + 8 * TEMPP2;
                        }
@@ -73,4 +83,87 @@ public class AltosMs5607 {
                convert();
                return pa;
        }
+
+       public boolean parse_line(String line) {
+               System.out.printf ("parse %s\n", line);
+               String[] items = line.split("\\s+");
+               if (line.startsWith("Pressure:")) {
+                       if (items.length >= 2) {
+                               raw_pres = Integer.parseInt(items[1]);
+                               System.out.printf ("raw_pres %d\n", raw_pres);
+                       }
+               } else if (line.startsWith("Temperature:")) {
+                       if (items.length >= 2)
+                               raw_temp = Integer.parseInt(items[1]);
+               } else if (line.startsWith("ms5607 reserved:")) {
+                       if (items.length >= 3)
+                               reserved = Integer.parseInt(items[2]);
+               } else if (line.startsWith("ms5607 sens:")) {
+                       System.out.printf ("found sens length %d\n", items.length);
+                       if (items.length >= 3) {
+                               sens = Integer.parseInt(items[2]);
+                               System.out.printf ("sens %d\n", sens);
+                       }
+               } else if (line.startsWith("ms5607 off:")) {
+                       if (items.length >= 3)
+                               off = Integer.parseInt(items[2]);
+               } else if (line.startsWith("ms5607 tcs:")) {
+                       if (items.length >= 3)
+                               tcs = Integer.parseInt(items[2]);
+               } else if (line.startsWith("ms5607 tco:")) {
+                       if (items.length >= 3)
+                               tco = Integer.parseInt(items[2]);
+               } else if (line.startsWith("ms5607 tref:")) {
+                       if (items.length >= 3)
+                               tref = Integer.parseInt(items[2]);
+               } else if (line.startsWith("ms5607 tempsens:")) {
+                       if (items.length >= 3)
+                               tempsens = Integer.parseInt(items[2]);
+               } else if (line.startsWith("ms5607 crc:")) {
+                       if (items.length >= 3)
+                               crc = Integer.parseInt(items[2]);
+               } else if (line.startsWith("Altitude:")) {
+                       return false;
+               }
+               return true;
+       }
+
+       static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+               try {
+                       AltosMs5607     ms5607 = new AltosMs5607(link);
+
+                       if (ms5607 != null) {
+                               state.set_ms5607(ms5607);
+                               return;
+                       }
+               } catch (TimeoutException te) {
+               } catch (InterruptedException ie) {
+               }
+       }
+
+       public AltosMs5607() {
+               raw_pres = AltosLib.MISSING;
+               raw_temp = AltosLib.MISSING;
+               pa = AltosLib.MISSING;
+               cc = AltosLib.MISSING;
+       }
+
+       public AltosMs5607 (AltosLink link) throws InterruptedException, TimeoutException {
+               this();
+               link.printf("c s\nB\n");
+               for (;;) {
+                       String line = link.get_reply_no_dialog(5000);
+                       if (line == null) {
+                               throw new TimeoutException();
+                       }
+                       if (!parse_line(line)) {
+                               System.out.printf ("stop parsing at %s\n", line);
+                               break;
+                       }
+               }
+               System.out.printf ("sens %d off %d tcs %d tco %d tref %d tempsens %d crc %d pres %d temp %d\n",
+                                  sens, off, tcs, tco, tref, tempsens, crc, raw_pres, raw_temp);
+               convert();
+               System.out.printf ("pa %d cc %d\n", pa, cc);
+       }
 }