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

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 318fea4d..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,7 +16,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_11;
+
+import java.util.concurrent.*;
+import java.io.*;
 
 public class AltosMs5607 {
 	public int	reserved;
@@ -42,7 +46,7 @@ public class AltosMs5607 {
 		//int P;
 
 		dT = raw_temp - ((int) tref << 8);
-	
+
 		TEMP = (int) (2000 + (((long) dT * (long) tempsens) >> 23));
 
 		if (ms5611) {
@@ -53,14 +57,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;
@@ -85,8 +89,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 +99,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 +120,66 @@ 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 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 = 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(AltosConfigData config_data) {
+		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;
+	}
+
+	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) {
+				throw new TimeoutException();
+			}
+			if (!parse_line(line)) {
+				break;
+			}
+		}
+		convert();
 	}
 }