X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMs5607.java;h=a769223e299a376b5671fdb5ed2f77cd77f3160f;hb=7175774c4f60ed3efd54417f2035b50ea0108c7b;hp=8e6f2658d76822bad94e841964b7a6ae0e364582;hpb=643c2fb03833d658320f476ef731bbb06fe3cc31;p=fw%2Faltos

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 8e6f2658..a769223e 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_7;
+package org.altusmetrum.altoslib_11;
 
 import java.util.concurrent.*;
 import java.io.*;
 
-public class AltosMs5607 implements Serializable {
+public class AltosMs5607 implements AltosJsonable {
 	public int	reserved;
 	public int	sens;
 	public int	off;
@@ -166,4 +166,46 @@ public class AltosMs5607 implements Serializable {
 		}
 		convert();
 	}
+
+	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(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);
+	}
 }