altosuilib: Track open frames, exit when none remain

[fw/altos] / altoslib / AltosMs5607.java

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 318fea4d290ac1e88165f9722350cbf131e799bb..88a978280af9e0004c89127c0c8019c78e34f035 100644 (file)
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -15,9 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_11;
 
-public class AltosMs5607 {
+import java.util.concurrent.*;
+import java.io.*;
+
+public class AltosMs5607 implements AltosHashable {
        public int      reserved;
        public int      sens;
        public int      off;
@@ -42,7 +45,7 @@ public class AltosMs5607 {
                //int P;
 
                dT = raw_temp - ((int) tref << 8);
-       
+
                TEMP = (int) (2000 + (((long) dT * (long) tempsens) >> 23));
 
                if (ms5611) {
@@ -53,7 +56,7 @@ public class AltosMs5607 {
                        OFF = ((long) off << 17) + (((long) tco * (long) dT) >> 6);
 
                        SENS = ((long) sens << 16) + (((long) tcs * (long) dT) >> 7);
-               } 
+               }
 
                if (TEMP < 2000) {
                        int     T2 = (int) (((long) dT * (long) dT) >> 31);
@@ -85,8 +88,9 @@ public class AltosMs5607 {
        public boolean parse_line(String line) {
                String[] items = line.split("\\s+");
                if (line.startsWith("Pressure:")) {
-                       if (items.length >= 2)
+                       if (items.length >= 2) {
                                raw_pres = Integer.parseInt(items[1]);
+                       }
                } else if (line.startsWith("Temperature:")) {
                        if (items.length >= 2)
                                raw_temp = Integer.parseInt(items[1]);
@@ -94,8 +98,9 @@ public class AltosMs5607 {
                        if (items.length >= 3)
                                reserved = Integer.parseInt(items[2]);
                } else if (line.startsWith("ms5607 sens:")) {
-                       if (items.length >= 3)
+                       if (items.length >= 3) {
                                sens = Integer.parseInt(items[2]);
+                       }
                } else if (line.startsWith("ms5607 off:")) {
                        if (items.length >= 3)
                                off = Integer.parseInt(items[2]);
@@ -114,15 +119,93 @@ public class AltosMs5607 {
                } else if (line.startsWith("ms5607 crc:")) {
                        if (items.length >= 3)
                                crc = Integer.parseInt(items[2]);
-               } else if (line.startsWith("Altitude"))
+               } else if (line.startsWith("Altitude:")) {
                        return false;
+               }
                return true;
        }
 
+       static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+               try {
+                       AltosMs5607     ms5607 = new AltosMs5607(link, config_data);
+
+                       if (ms5607 != null) {
+                               state.set_ms5607(ms5607);
+                               return;
+                       }
+               } catch (TimeoutException te) {
+               }
+       }
+
        public AltosMs5607() {
-               raw_pres = AltosRecord.MISSING;
-               raw_temp = AltosRecord.MISSING;
-               pa = AltosRecord.MISSING;
-               cc = AltosRecord.MISSING;
+               raw_pres = AltosLib.MISSING;
+               raw_temp = AltosLib.MISSING;
+               pa = AltosLib.MISSING;
+               cc = AltosLib.MISSING;
+       }
+
+       public AltosMs5607 (AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException {
+               this();
+               reserved = config_data.ms5607_reserved;
+               sens = config_data.ms5607_sens;
+               off = config_data.ms5607_off;
+               tcs = config_data.ms5607_tcs;
+               tco = config_data.ms5607_tco;
+               tref = config_data.ms5607_tref;
+               tempsens = config_data.ms5607_tempsens;
+               crc = config_data.ms5607_crc;
+               link.printf("B\n");
+               for (;;) {
+                       String line = link.get_reply_no_dialog(5000);
+                       if (line == null) {
+                               throw new TimeoutException();
+                       }
+                       if (!parse_line(line)) {
+                               break;
+                       }
+               }
+               convert();
+       }
+
+       public AltosHashSet hashSet() {
+               AltosHashSet h = new AltosHashSet();
+
+               h.putInt("reserved", reserved);
+               h.putInt("sens", sens);
+               h.putInt("off", off);
+               h.putInt("tcs", tcs);
+               h.putInt("tco", tco);
+               h.putInt("tref", tref);
+               h.putInt("tempsens", tempsens);
+               h.putInt("crc", crc);
+               h.putInt("raw_pres", raw_pres);
+               h.putInt("raw_temp", raw_temp);
+               h.putInt("pa", pa);
+               h.putInt("cc", cc);
+               return h;
+       }
+
+       public AltosMs5607(AltosHashSet h) {
+               this();
+
+               reserved = h.getInt("reserved", reserved);
+               sens = h.getInt("sens", sens);
+               off = h.getInt("off", off);
+               tcs = h.getInt("tcs", tcs);
+               tco = h.getInt("tco", tco);
+               tref = h.getInt("tref", tref);
+               tempsens = h.getInt("tempsens", tempsens);
+               crc = h.getInt("crc", crc);
+               raw_pres = h.getInt("raw_pres", raw_pres);
+               raw_temp = h.getInt("raw_temp", raw_temp);
+               pa = h.getInt("pa", pa);
+               cc = h.getInt("cc", cc);
+       }
+
+       public static AltosMs5607 fromHashSet(AltosHashSet h, AltosMs5607 def) {
+               if (h == null)
+                       return def;
+
+               return new AltosMs5607(h);
        }
 }