altos: remove usbtrng support (chaoskey prototypes)
[fw/altos] / altoslib / AltosMs5607.java
index 148a9f9252be841c8d4e7eb3479bd14d963586d7..c4ddaea9528ce14caae4b06d2eb388b69afe3e6a 100644 (file)
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_13;
+
+import java.util.concurrent.*;
+import java.io.*;
 
 public class AltosMs5607 {
-       public int      reserved;
-       public int      sens;
-       public int      off;
-       public int      tcs;
-       public int      tco;
-       public int      tref;
-       public int      tempsens;
-       public int      crc;
-
-       public int      raw_pres;
-       public int      raw_temp;
-       public int      pa;
-       public int      cc;
-
-       static final boolean    ms5611 = false;
-
-       void convert() {
+       public int      reserved = AltosLib.MISSING;
+       public int      sens = AltosLib.MISSING;
+       public int      off = AltosLib.MISSING;
+       public int      tcs = AltosLib.MISSING;
+       public int      tco = AltosLib.MISSING;
+       public int      tref = AltosLib.MISSING;
+       public int      tempsens = AltosLib.MISSING;
+       public int      crc = AltosLib.MISSING;
+       private boolean ms5611 = false;
+
+       public boolean valid_config() {
+               return reserved != AltosLib.MISSING &&
+                       sens != AltosLib.MISSING &&
+                       off != AltosLib.MISSING &&
+                       tcs != AltosLib.MISSING &&
+                       tco != AltosLib.MISSING &&
+                       tref != AltosLib.MISSING &&
+                       tempsens != AltosLib.MISSING &&
+                       crc  != AltosLib.MISSING;
+       }
+
+       public AltosPresTemp pres_temp(int raw_pres, int raw_temp) {
                int     dT;
-               int TEMP;
-               long OFF;
-               long SENS;
-               //int P;
+               int     TEMP;
+               long    OFF;
+               long    SENS;
+               int     P;
+
+               if (raw_pres == AltosLib.MISSING || raw_temp == AltosLib.MISSING)
+                       return new AltosPresTemp(AltosLib.MISSING, AltosLib.MISSING);
 
                dT = raw_temp - ((int) tref << 8);
-       
+
                TEMP = (int) (2000 + (((long) dT * (long) tempsens) >> 23));
 
                if (ms5611) {
@@ -53,14 +65,14 @@ 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);
                        int TEMPM = TEMP - 2000;
                        long OFF2 = ((long) 61 * (long) TEMPM * (long) TEMPM) >> 4;
                        long SENS2 = (long) 2 * (long) TEMPM * (long) TEMPM;
-                       if (TEMP < 1500) {
+                       if (TEMP < -1500) {
                                int TEMPP = TEMP + 1500;
                                long TEMPP2 = (long) TEMPP * (long) TEMPP;
                                OFF2 = OFF2 + 15 * TEMPP2;
@@ -71,21 +83,75 @@ public class AltosMs5607 {
                        SENS -= SENS2;
                }
 
-               pa = (int) (((((long) raw_pres * SENS) >> 21) - OFF) >> 15);
-               cc = TEMP;
+               P = (int) (((((long) raw_pres * SENS) >> 21) - OFF) >> 15);
+
+               return new AltosPresTemp(P, TEMP / 100.0);
        }
 
-       public int set(int in_pres, int in_temp) {
-               raw_pres = in_pres;
-               raw_temp = in_temp;
-               convert();
-               return pa;
+       public AltosPresTemp pres_temp(AltosLink link) throws InterruptedException, TimeoutException {
+               int     raw_pres = AltosLib.MISSING;
+               int     raw_temp = AltosLib.MISSING;
+               boolean done = false;
+
+               link.printf("B\n");
+               while (!done) {
+                       String line = link.get_reply_no_dialog(5000);
+                       if (line == null)
+                               throw new TimeoutException();
+
+                       String[] items = line.split("\\s+");
+                       if (line.startsWith("Pressure:")) {
+                               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]);
+                       } else if (line.startsWith("Altitude:")) {
+                               done = true;
+                       }
+               }
+               return pres_temp(raw_pres, raw_temp);
+       }
+
+       public AltosMs5607(boolean ms5611) {
+               this.ms5611 = ms5611;
        }
 
        public AltosMs5607() {
-               raw_pres = AltosRecord.MISSING;
-               raw_temp = AltosRecord.MISSING;
-               pa = AltosRecord.MISSING;
-               cc = AltosRecord.MISSING;
+               this(false);
+       }
+
+       public AltosMs5607(AltosMs5607 old) {
+               reserved = old.reserved;
+               sens = old.sens;
+               off = old.off;
+               tcs = old.tcs;
+               tco = old.tco;
+               tref = old.tref;
+               tempsens = old.tempsens;
+               crc = old.crc;
+       }
+
+       static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
+               try {
+                       AltosCalData    cal_data = listener.cal_data();
+                       AltosMs5607     ms5607 = cal_data.ms5607;
+
+                       if (ms5607 != null) {
+                               AltosPresTemp   pt = ms5607.pres_temp(link);
+                               listener.set_temperature(pt.temp);
+                               listener.set_pressure(pt.pres);
+                       }
+               } catch (TimeoutException te) {
+               }
+       }
+
+       public AltosMs5607(AltosConfigData config_data) {
+               this(config_data.ms5607());
+       }
+
+       public AltosMs5607 (AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException {
+               this(config_data);
        }
 }