X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMs5607.java;h=6d2f22032c8715414461375b410b7a255e66fe1a;hb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b;hp=1277f2672f9e34463e95bbd4752d219dee649872;hpb=21d176f161b90f18f236ef887cef9676d712eee3;p=fw%2Faltos

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 1277f267..6d2f2203 100644
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_10;
+package org.altusmetrum.altoslib_11;
 
 import java.util.concurrent.*;
 import java.io.*;
 
-public class AltosMs5607 implements Serializable {
+public class AltosMs5607 implements AltosHashable, AltosJsonable {
 	public int	reserved;
 	public int	sens;
 	public int	off;
@@ -166,4 +166,88 @@ public class AltosMs5607 implements Serializable {
 		}
 		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 AltosJson json() {
+		AltosJson j = new AltosJson();
+
+		j.put("reserved", reserved);
+		j.put("sens", sens);
+		j.put("off", off);
+		j.put("tcs", tcs);
+		j.put("tco", tco);
+		j.put("tref", tref);
+		j.put("tempsens", tempsens);
+		j.put("crc", crc);
+		j.put("raw_pres", raw_pres);
+		j.put("raw_temp", raw_temp);
+		j.put("pa", pa);
+		j.put("cc", cc);
+		return j;
+	}
+
+	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);
+	}
+
+	public AltosMs5607(AltosJson j) {
+		this();
+
+		reserved = j.get_int("reserved", reserved);
+		sens = j.get_int("sens", sens);
+		off = j.get_int("off", off);
+		tcs = j.get_int("tcs", tcs);
+		tco = j.get_int("tco", tco);
+		tref = j.get_int("tref", tref);
+		tempsens = j.get_int("tempsens", tempsens);
+		crc = j.get_int("crc", crc);
+		raw_pres = j.get_int("raw_pres", raw_pres);
+		raw_temp = j.get_int("raw_temp", raw_temp);
+		pa = j.get_int("pa", pa);
+		cc = j.get_int("cc", cc);
+	}
+
+	public static AltosMs5607 fromJson(AltosJson j, AltosMs5607 def) {
+		if (j == null)
+			return def;
+
+		return new AltosMs5607(j);
+	}
 }