X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMs5607.java;fp=altoslib%2FAltosMs5607.java;h=a769223e299a376b5671fdb5ed2f77cd77f3160f;hp=6d2f22032c8715414461375b410b7a255e66fe1a;hb=f7e2f7f430e612c682bf55478860054ce94b995f;hpb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java index 6d2f2203..a769223e 100644 --- a/altoslib/AltosMs5607.java +++ b/altoslib/AltosMs5607.java @@ -20,7 +20,7 @@ package org.altusmetrum.altoslib_11; import java.util.concurrent.*; import java.io.*; -public class AltosMs5607 implements AltosHashable, AltosJsonable { +public class AltosMs5607 implements AltosJsonable { public int reserved; public int sens; public int off; @@ -167,24 +167,6 @@ public class AltosMs5607 implements AltosHashable, AltosJsonable { 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(); @@ -203,30 +185,6 @@ public class AltosMs5607 implements AltosHashable, AltosJsonable { 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();