X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosIMU.java;h=dbadcf898efbab85db95d47f5579df9686f9ea56;hb=1dce20f7eee56166ac61798ca26eeb323dc8f012;hp=ecc02f15b5d2dda6e7b8c62be7027eff2984e7dd;hpb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b;p=fw%2Faltos

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index ecc02f15..dbadcf89 100644
--- 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, AltosHashable, AltosJsonable {
+public class AltosIMU implements Cloneable {
 	public int		accel_along;
 	public int		accel_across;
 	public int		accel_through;
@@ -115,66 +115,4 @@ public class AltosIMU implements Cloneable, AltosHashable, AltosJsonable {
 				break;
 		}
 	}
-
-	public AltosIMU (AltosHashSet h) {
-		this();
-
-		accel_along = h.getInt("accel_along", accel_along);
-		accel_across = h.getInt("accel_across", accel_across);
-		accel_through = h.getInt("accel_through", accel_through);
-
-		gyro_roll = h.getInt("gyro_roll", gyro_roll);
-		gyro_pitch = h.getInt("gyro_pitch", gyro_pitch);
-		gyro_yaw = h.getInt("gyro_yaw", gyro_yaw);
-	}
-
-	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 fromHashSet(AltosHashSet h, AltosIMU def) {
-		if (h == null)
-			return def;
-		return new AltosIMU(h);
-	}
-
-	static public AltosIMU fromJson(AltosJson j, AltosIMU def) {
-		if (j == null)
-			return def;
-		return new AltosIMU(j);
-	}
-
-	public AltosHashSet hashSet() {
-		AltosHashSet	h = new AltosHashSet();
-
-		h.putInt("accel_along", accel_along);
-		h.putInt("accel_across", accel_across);
-		h.putInt("accel_through", accel_through);
-
-		h.putInt("gyro_roll", gyro_roll);
-		h.putInt("gyro_pitch", gyro_pitch);
-		h.putInt("gyro_yaw", gyro_yaw);
-		return h;
-	}
-
-	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;
-	}
 }