diff options
author | Keith Packard <keithp@keithp.com> | 2016-06-15 22:52:08 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2016-06-15 22:52:08 -0700 |
commit | f7e2f7f430e612c682bf55478860054ce94b995f (patch) | |
tree | d8274c9fdc2b3731e4b8a2438a7e453a7cd23b37 /altoslib/AltosIMU.java | |
parent | 1b5ea911049a8afae6af475a4a2bf62a6e3aa57b (diff) |
altoslib: Remove AltosHashSet code
Everything has switched to JSON now.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosIMU.java')
-rw-r--r-- | altoslib/AltosIMU.java | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java index ecc02f15..672c6111 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, AltosJsonable { public int accel_along; public int accel_across; public int accel_through; @@ -116,18 +116,6 @@ public class AltosIMU implements Cloneable, AltosHashable, AltosJsonable { } } - 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(); @@ -140,31 +128,12 @@ public class AltosIMU implements Cloneable, AltosHashable, AltosJsonable { 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(); |