summaryrefslogtreecommitdiff
path: root/altoslib/AltosIMU.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-06-17 00:52:38 -0700
committerKeith Packard <keithp@keithp.com>2016-06-17 01:03:40 -0700
commit1dce20f7eee56166ac61798ca26eeb323dc8f012 (patch)
treee7f64afa79991e10d0b7aa680e98af3ce96a62bb /altoslib/AltosIMU.java
parent7175774c4f60ed3efd54417f2035b50ea0108c7b (diff)
altoslib: Get rid of manual JSON encoding stuff
Now that the reflective JSON stuff is working, we can delete all of the manual code. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosIMU.java')
-rw-r--r--altoslib/AltosIMU.java33
1 files changed, 1 insertions, 32 deletions
diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index 672c6111..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, 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;
- }
}