Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosMs5607.java

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index a769223e299a376b5671fdb5ed2f77cd77f3160f..631bc716d41c23fbb70324f36b812b363fcbac30 100644 (file)
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +21,7 @@ package org.altusmetrum.altoslib_11;
 import java.util.concurrent.*;
 import java.io.*;
 
-public class AltosMs5607 implements AltosJsonable {
+public class AltosMs5607 {
        public int      reserved;
        public int      sens;
        public int      off;
@@ -166,46 +167,4 @@ public class AltosMs5607 implements AltosJsonable {
                }
                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);
-       }
 }