altoslib: Correct monitor idle IMU data for EasyMega v2
[fw/altos] / altoslib / AltosIMU.java
index 672c611172929115724b0382a977beeba5b1a4d6..8adf710e028a03f8e401ec4c48de5c1e9138a805 100644 (file)
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 import java.util.concurrent.*;
 import java.io.*;
 
-public class AltosIMU implements Cloneable, AltosJsonable {
-       public int              accel_along;
-       public int              accel_across;
-       public int              accel_through;
+public class AltosIMU implements Cloneable {
+       public int              accel_x = AltosLib.MISSING;
+       public int              accel_y = AltosLib.MISSING;
+       public int              accel_z = AltosLib.MISSING;
 
-       public int              gyro_roll;
-       public int              gyro_pitch;
-       public int              gyro_yaw;
+       public int              gyro_x = AltosLib.MISSING;
+       public int              gyro_y = AltosLib.MISSING;
+       public int              gyro_z = AltosLib.MISSING;
+
+       public int              mag_x = AltosLib.MISSING;
+       public int              mag_y = AltosLib.MISSING;
+       public int              mag_z = AltosLib.MISSING;
 
        public static final double      counts_per_g = 2048.0;
 
        public static double convert_accel(double counts) {
-               return counts / counts_per_g * (-AltosConvert.GRAVITATIONAL_ACCELERATION);
+               return counts / counts_per_g * AltosConvert.gravity;
        }
 
-       public static final double      counts_per_degsec = 16.4;
+       /* In radians */
+       public static final double      GYRO_FULLSCALE_DEGREES = 2000.0;
+       public static final double      GYRO_COUNTS = 32767.0;
 
-       public static double convert_gyro(double counts) {
-               return counts / counts_per_degsec;
+       public static double gyro_degrees_per_second(double counts, double cal) {
+               return (counts - cal) * GYRO_FULLSCALE_DEGREES / GYRO_COUNTS;
        }
 
        public boolean parse_string(String line) {
@@ -48,12 +55,17 @@ public class AltosIMU implements Cloneable, AltosJsonable {
                String[] items = line.split("\\s+");
 
                if (items.length >= 8) {
-                       accel_along = Integer.parseInt(items[1]);
-                       accel_across = Integer.parseInt(items[2]);
-                       accel_through = Integer.parseInt(items[3]);
-                       gyro_roll = Integer.parseInt(items[5]);
-                       gyro_pitch = Integer.parseInt(items[6]);
-                       gyro_yaw = Integer.parseInt(items[7]);
+                       accel_x = Integer.parseInt(items[1]);
+                       accel_y = Integer.parseInt(items[2]);
+                       accel_z = Integer.parseInt(items[3]);
+                       gyro_x = Integer.parseInt(items[5]);
+                       gyro_y = Integer.parseInt(items[6]);
+                       gyro_z = Integer.parseInt(items[7]);
+               }
+               if (items.length >= 12) {
+                       mag_x = Integer.parseInt(items[9]);
+                       mag_y = Integer.parseInt(items[10]);
+                       mag_z = Integer.parseInt(items[11]);
                }
                return true;
        }
@@ -61,46 +73,136 @@ public class AltosIMU implements Cloneable, AltosJsonable {
        public AltosIMU clone() {
                AltosIMU        n = new AltosIMU();
 
-               n.accel_along = accel_along;
-               n.accel_across = accel_across;
-               n.accel_through = accel_through;
+               n.accel_x = accel_x;
+               n.accel_y = accel_y;
+               n.accel_z = accel_z;
+
+               n.gyro_x = gyro_x;
+               n.gyro_y = gyro_y;
+               n.gyro_z = gyro_z;
+
+               n.mag_x = mag_x;
+               n.mag_y = mag_y;
+               n.mag_z = mag_z;
 
-               n.gyro_roll = gyro_roll;
-               n.gyro_pitch = gyro_pitch;
-               n.gyro_yaw = gyro_yaw;
                return n;
        }
 
-       static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
-               try {
-                       AltosIMU        imu = new AltosIMU(link);
+       public static final int orient_telemega = 0;
+       public static final int orient_easymega_v2 = 1;
+
+       private int accel_across(int orient) {
+               switch (orient) {
+               case orient_telemega:
+                       return accel_x;
+               case orient_easymega_v2:
+                       return -accel_y;
+               default:
+                       return AltosLib.MISSING;
+               }
+       }
 
-                       if (imu != null)
-                               state.set_imu(imu);
-               } catch (TimeoutException te) {
+       private int accel_along(int orient) {
+               switch (orient) {
+               case orient_telemega:
+                       return accel_y;
+               case orient_easymega_v2:
+                       return accel_x;
+               default:
+                       return AltosLib.MISSING;
                }
        }
 
-       public AltosIMU() {
-               accel_along = AltosLib.MISSING;
-               accel_across = AltosLib.MISSING;
-               accel_through = AltosLib.MISSING;
+       private int accel_through(int orient) {
+               return accel_z;
+       }
+
+       private int gyro_roll(int orient) {
+               switch (orient) {
+               case orient_telemega:
+                       return gyro_y;
+               case orient_easymega_v2:
+                       return gyro_x;
+               default:
+                       return AltosLib.MISSING;
+               }
+       }
+
+       private int gyro_pitch(int orient) {
+               switch (orient) {
+               case orient_telemega:
+                       return gyro_x;
+               case orient_easymega_v2:
+                       return -gyro_y;
+               default:
+                       return AltosLib.MISSING;
+               }
+       }
+
+       private int gyro_yaw(int orient) {
+               return gyro_z;
+       }
+
+       private int mag_across(int orient) {
+               switch (orient) {
+               case orient_telemega:
+                       return mag_x;
+               case orient_easymega_v2:
+                       return -mag_y;
+               default:
+                       return AltosLib.MISSING;
+               }
+       }
 
-               gyro_roll = AltosLib.MISSING;
-               gyro_pitch = AltosLib.MISSING;
-               gyro_yaw = AltosLib.MISSING;
+       private int mag_along(int orient) {
+               switch (orient) {
+               case orient_telemega:
+                       return mag_y;
+               case orient_easymega_v2:
+                       return mag_x;
+               default:
+                       return AltosLib.MISSING;
+               }
+       }
+
+       private int mag_through(int orient) {
+               return mag_z;
        }
 
-       public AltosIMU(int accel_along, int accel_across, int accel_through,
-                       int gyro_roll, int gyro_pitch, int gyro_yaw) {
+       static public void provide_data(AltosDataListener listener, AltosLink link, int orient) throws InterruptedException {
+               try {
+                       AltosIMU        imu = new AltosIMU(link);
+                       AltosCalData    cal_data = listener.cal_data();
+
+                       if (imu != null) {
+                               listener.set_gyro(cal_data.gyro_roll(imu.gyro_roll(orient)),
+                                                 cal_data.gyro_pitch(imu.gyro_pitch(orient)),
+                                                 cal_data.gyro_yaw(imu.gyro_yaw(orient)));
+                               listener.set_accel_ground(imu.accel_along(orient),
+                                                         imu.accel_across(orient),
+                                                         imu.accel_through(orient));
+                               if (imu.mag_x != AltosLib.MISSING) {
+                                       listener.set_mag(cal_data.mag_along(imu.mag_along(orient)),
+                                                        cal_data.mag_across(imu.mag_across(orient)),
+                                                        cal_data.mag_through(imu.mag_through(orient)));
+                               }
+                       }
+               } catch (TimeoutException te) {
+               }
+       }
+
+       public AltosIMU() {
+               accel_x = AltosLib.MISSING;
+               accel_y = AltosLib.MISSING;
+               accel_z = AltosLib.MISSING;
 
-               this.accel_along = accel_along;
-               this.accel_across = accel_across;
-               this.accel_through = accel_through;
+               gyro_x = AltosLib.MISSING;
+               gyro_y = AltosLib.MISSING;
+               gyro_z = AltosLib.MISSING;
 
-               this.gyro_roll = gyro_roll;
-               this.gyro_pitch = gyro_pitch;
-               this.gyro_yaw = gyro_yaw;
+               mag_x = AltosLib.MISSING;
+               mag_y = AltosLib.MISSING;
+               mag_z = AltosLib.MISSING;
        }
 
        public AltosIMU(AltosLink link) throws InterruptedException, TimeoutException {
@@ -115,35 +217,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;
-       }
 }