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

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 81e0641c..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
@@ -15,9 +16,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
 
 import java.util.concurrent.*;
+import java.io.*;
 
 public class AltosMs5607 {
 	public int	reserved;
@@ -62,7 +64,7 @@ public class AltosMs5607 {
 			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;
@@ -126,7 +128,7 @@ public class AltosMs5607 {
 
 	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
 		try {
-			AltosMs5607	ms5607 = new AltosMs5607(link);
+			AltosMs5607	ms5607 = new AltosMs5607(link, config_data);
 
 			if (ms5607 != null) {
 				state.set_ms5607(ms5607);
@@ -136,6 +138,17 @@ public class AltosMs5607 {
 		}
 	}
 
+	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;
@@ -143,9 +156,21 @@ public class AltosMs5607 {
 		cc = AltosLib.MISSING;
 	}
 
-	public AltosMs5607 (AltosLink link) throws InterruptedException, TimeoutException {
+	public AltosMs5607(AltosConfigData config_data) {
 		this();
-		link.printf("c s\nB\n");
+		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;
+	}
+
+	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);
 			if (line == null) {