X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMs5607.java;h=c598d01e4a6021c5b8d15e8ddf3565c37fa3735f;hb=c17b78e60c340c8a3e3d6f9b875667c66216647a;hp=88a978280af9e0004c89127c0c8019c78e34f035;hpb=b1a90adac9f6e2a609ce1ccd6749462bb5c9adbe;p=fw%2Faltos

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 88a97828..c598d01e 100644
--- 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 AltosHashable {
+public class AltosMs5607 {
 	public int	reserved;
 	public int	sens;
 	public int	off;
@@ -63,7 +64,7 @@ public class AltosMs5607 implements AltosHashable {
 			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 AltosHashable {
 		}
 	}
 
+	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 AltosHashable {
 		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 AltosHashable {
 		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 AltosHashable {
 		}
 		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);
-	}
 }