X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMs5607.java;h=81e0641c2d9a8f42301dffbfba4fb29483ca8e49;hp=5fd997d8ab73f8d64393c7cdc353ba1199a22738;hb=c8078d352a7f54a4a97d25af080155d3f875536a;hpb=6f421818fd7062f03bfaf9e606d6a4cfdcb13b49

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 5fd997d8..81e0641c 100644
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -15,7 +15,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_5;
+
+import java.util.concurrent.*;
 
 public class AltosMs5607 {
 	public int	reserved;
@@ -32,29 +34,37 @@ public class AltosMs5607 {
 	public int	pa;
 	public int	cc;
 
+	static final boolean	ms5611 = false;
+
 	void convert() {
 		int	dT;
 		int TEMP;
 		long OFF;
 		long SENS;
-		int P;
+		//int P;
 
 		dT = raw_temp - ((int) tref << 8);
-	
-		TEMP = (int) (2000 + (((long) dT * tempsens) >> 23));
 
-		OFF = ((long) off << 17) + (((long) tco * dT) >> 6);
+		TEMP = (int) (2000 + (((long) dT * (long) tempsens) >> 23));
+
+		if (ms5611) {
+			OFF = ((long) off << 16) + (((long) tco * (long) dT) >> 7);
 
-		SENS = ((long) sens << 16) + (((long) tcs * dT) >> 7);
+			SENS = ((long) sens << 15) + (((long) tcs * (long) dT) >> 8);
+		} else {
+			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 = (61 * (long) TEMPM * (long) TEMPM) >> 4;
-			long SENS2 = 2 * (long) TEMPM * (long) TEMPM;
+			long OFF2 = ((long) 61 * (long) TEMPM * (long) TEMPM) >> 4;
+			long SENS2 = (long) 2 * (long) TEMPM * (long) TEMPM;
 			if (TEMP < 1500) {
 				int TEMPP = TEMP + 1500;
-				long TEMPP2 = TEMPP * TEMPP;
+				long TEMPP2 = (long) TEMPP * (long) TEMPP;
 				OFF2 = OFF2 + 15 * TEMPP2;
 				SENS2 = SENS2 + 8 * TEMPP2;
 			}
@@ -74,10 +84,77 @@ public class AltosMs5607 {
 		return pa;
 	}
 
+	public boolean parse_line(String line) {
+		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("ms5607 reserved:")) {
+			if (items.length >= 3)
+				reserved = Integer.parseInt(items[2]);
+		} else if (line.startsWith("ms5607 sens:")) {
+			if (items.length >= 3) {
+				sens = Integer.parseInt(items[2]);
+			}
+		} else if (line.startsWith("ms5607 off:")) {
+			if (items.length >= 3)
+				off = Integer.parseInt(items[2]);
+		} else if (line.startsWith("ms5607 tcs:")) {
+			if (items.length >= 3)
+				tcs = Integer.parseInt(items[2]);
+		} else if (line.startsWith("ms5607 tco:")) {
+			if (items.length >= 3)
+				tco = Integer.parseInt(items[2]);
+		} else if (line.startsWith("ms5607 tref:")) {
+			if (items.length >= 3)
+				tref = Integer.parseInt(items[2]);
+		} else if (line.startsWith("ms5607 tempsens:")) {
+			if (items.length >= 3)
+				tempsens = Integer.parseInt(items[2]);
+		} else if (line.startsWith("ms5607 crc:")) {
+			if (items.length >= 3)
+				crc = Integer.parseInt(items[2]);
+		} 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);
+
+			if (ms5607 != null) {
+				state.set_ms5607(ms5607);
+				return;
+			}
+		} catch (TimeoutException te) {
+		}
+	}
+
 	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 (AltosLink link) throws InterruptedException, TimeoutException {
+		this();
+		link.printf("c s\nB\n");
+		for (;;) {
+			String line = link.get_reply_no_dialog(5000);
+			if (line == null) {
+				throw new TimeoutException();
+			}
+			if (!parse_line(line)) {
+				break;
+			}
+		}
+		convert();
 	}
 }