altoslib: Get rid of manual JSON encoding stuff

[fw/altos] / altoslib / AltosIMU.java

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index 672c611172929115724b0382a977beeba5b1a4d6..dbadcf898efbab85db95d47f5579df9686f9ea56 100644 (file)
--- a/altoslib/AltosIMU.java
+++ b/altoslib/AltosIMU.java
@@ -20,7 +20,7 @@ package org.altusmetrum.altoslib_11;
 import java.util.concurrent.*;
 import java.io.*;
 
-public class AltosIMU implements Cloneable, AltosJsonable {
+public class AltosIMU implements Cloneable {
        public int              accel_along;
        public int              accel_across;
        public int              accel_through;
@@ -115,35 +115,4 @@ public class AltosIMU implements Cloneable, AltosJsonable {
                                break;
                }
        }
-
-       public AltosIMU (AltosJson j) {
-               this();
-
-               accel_along = j.get_int("accel_along", accel_along);
-               accel_across = j.get_int("accel_across", accel_across);
-               accel_through = j.get_int("accel_through", accel_through);
-
-               gyro_roll = j.get_int("gyro_roll", gyro_roll);
-               gyro_pitch = j.get_int("gyro_pitch", gyro_pitch);
-               gyro_yaw = j.get_int("gyro_yaw", gyro_yaw);
-       }
-
-       static public AltosIMU fromJson(AltosJson j, AltosIMU def) {
-               if (j == null)
-                       return def;
-               return new AltosIMU(j);
-       }
-
-       public AltosJson json() {
-               AltosJson       j = new AltosJson();
-
-               j.put("accel_along", accel_along);
-               j.put("accel_across", accel_across);
-               j.put("accel_through", accel_through);
-
-               j.put("gyro_roll", gyro_roll);
-               j.put("gyro_pitch", gyro_pitch);
-               j.put("gyro_yaw", gyro_yaw);
-               return j;
-       }
 }