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

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 2319d5b8..88a97828 100644
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -15,11 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_11;
 
 import java.util.concurrent.*;
+import java.io.*;
 
-public class AltosMs5607 {
+public class AltosMs5607 implements AltosHashable {
 	public int	reserved;
 	public int	sens;
 	public int	off;
@@ -44,7 +45,7 @@ public class AltosMs5607 {
 		//int P;
 
 		dT = raw_temp - ((int) tref << 8);
-	
+
 		TEMP = (int) (2000 + (((long) dT * (long) tempsens) >> 23));
 
 		if (ms5611) {
@@ -55,7 +56,7 @@ 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);
@@ -126,7 +127,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);
@@ -143,9 +144,17 @@ public class AltosMs5607 {
 		cc = AltosLib.MISSING;
 	}
 
-	public AltosMs5607 (AltosLink link) throws InterruptedException, TimeoutException {
+	public AltosMs5607 (AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException {
 		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;
+		link.printf("B\n");
 		for (;;) {
 			String line = link.get_reply_no_dialog(5000);
 			if (line == null) {
@@ -157,4 +166,46 @@ public class AltosMs5607 {
 		}
 		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);
+	}
 }