altoslib: Add Ms5607 constructor that just takes config_data

[fw/altos] / altoslib / AltosMs5607.java

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index a769223e299a376b5671fdb5ed2f77cd77f3160f..c598d01e4a6021c5b8d15e8ddf3565c37fa3735f 100644 (file)
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -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
@@ -20,7 +21,7 @@ package org.altusmetrum.altoslib_11;
 import java.util.concurrent.*;
 import java.io.*;
 
-public class AltosMs5607 implements AltosJsonable {
+public class AltosMs5607 {
        public int      reserved;
        public int      sens;
        public int      off;
@@ -63,7 +64,7 @@ public class AltosMs5607 implements AltosJsonable {
                        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;
@@ -137,6 +138,17 @@ public class AltosMs5607 implements AltosJsonable {
                }
        }
 
+       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 AltosMs5607() {
                raw_pres = AltosLib.MISSING;
                raw_temp = AltosLib.MISSING;
@@ -144,7 +156,7 @@ public class AltosMs5607 implements AltosJsonable {
                cc = AltosLib.MISSING;
        }
 
-       public AltosMs5607 (AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException {
+       public AltosMs5607(AltosConfigData config_data) {
                this();
                reserved = config_data.ms5607_reserved;
                sens = config_data.ms5607_sens;
@@ -154,6 +166,10 @@ public class AltosMs5607 implements AltosJsonable {
                tref = config_data.ms5607_tref;
                tempsens = config_data.ms5607_tempsens;
                crc = config_data.ms5607_crc;
+       }
+
+       public AltosMs5607 (AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException {
+               this(config_data);
                link.printf("B\n");
                for (;;) {
                        String line = link.get_reply_no_dialog(5000);
@@ -166,46 +182,4 @@ public class AltosMs5607 implements AltosJsonable {
                }
                convert();
        }
-
-       public AltosJson json() {
-               AltosJson j = new AltosJson();
-
-               j.put("reserved", reserved);
-               j.put("sens", sens);
-               j.put("off", off);
-               j.put("tcs", tcs);
-               j.put("tco", tco);
-               j.put("tref", tref);
-               j.put("tempsens", tempsens);
-               j.put("crc", crc);
-               j.put("raw_pres", raw_pres);
-               j.put("raw_temp", raw_temp);
-               j.put("pa", pa);
-               j.put("cc", cc);
-               return j;
-       }
-
-       public AltosMs5607(AltosJson j) {
-               this();
-
-               reserved = j.get_int("reserved", reserved);
-               sens = j.get_int("sens", sens);
-               off = j.get_int("off", off);
-               tcs = j.get_int("tcs", tcs);
-               tco = j.get_int("tco", tco);
-               tref = j.get_int("tref", tref);
-               tempsens = j.get_int("tempsens", tempsens);
-               crc = j.get_int("crc", crc);
-               raw_pres = j.get_int("raw_pres", raw_pres);
-               raw_temp = j.get_int("raw_temp", raw_temp);
-               pa = j.get_int("pa", pa);
-               cc = j.get_int("cc", cc);
-       }
-
-       public static AltosMs5607 fromJson(AltosJson j, AltosMs5607 def) {
-               if (j == null)
-                       return def;
-
-               return new AltosMs5607(j);
-       }
 }