altoslib: Improve AltosState save/restore debugging

[fw/altos] / altoslib / AltosIMU.java

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index df6c4ed36fbc08c7d2d77cdbe56f06886cdc7eeb..672c611172929115724b0382a977beeba5b1a4d6 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, AltosHashable {
+public class AltosIMU implements Cloneable, AltosJsonable {
        public int              accel_along;
        public int              accel_across;
        public int              accel_through;
@@ -116,34 +116,34 @@ public class AltosIMU implements Cloneable, AltosHashable {
                }
        }
 
-       public AltosIMU (AltosHashSet h) {
+       public AltosIMU (AltosJson j) {
                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);
+               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 = h.getInt("gyro_roll", gyro_roll);
-               gyro_pitch = h.getInt("gyro_pitch", gyro_pitch);
-               gyro_yaw = h.getInt("gyro_yaw", gyro_yaw);
+               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)
+       static public AltosIMU fromJson(AltosJson j, AltosIMU def) {
+               if (j == null)
                        return def;
-               return new AltosIMU(h);
+               return new AltosIMU(j);
        }
 
-       public AltosHashSet hashSet() {
-               AltosHashSet    h = new AltosHashSet();
+       public AltosJson json() {
+               AltosJson       j = new AltosJson();
 
-               h.putInt("accel_along", accel_along);
-               h.putInt("accel_across", accel_across);
-               h.putInt("accel_through", accel_through);
+               j.put("accel_along", accel_along);
+               j.put("accel_across", accel_across);
+               j.put("accel_through", accel_through);
 
-               h.putInt("gyro_roll", gyro_roll);
-               h.putInt("gyro_pitch", gyro_pitch);
-               h.putInt("gyro_yaw", gyro_yaw);
-               return h;
+               j.put("gyro_roll", gyro_roll);
+               j.put("gyro_pitch", gyro_pitch);
+               j.put("gyro_yaw", gyro_yaw);
+               return j;
        }
 }