altoslib: Correct sign of telemega v4 pitch
authorKeith Packard <keithp@keithp.com>
Tue, 25 Feb 2020 19:51:57 +0000 (11:51 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 25 Feb 2020 23:39:08 +0000 (15:39 -0800)
Signed-off-by: Keith Packard <keithp@keithp.com>
altoslib/AltosEepromRecordMega.java
altoslib/AltosIMU.java

index ced942984883afc4a925c98b3125103b81d9e729..168b352c652a8a67707a45bb5bb6c516568ea7c4 100644 (file)
@@ -142,7 +142,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
                case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
                        return -gyro_y();
                case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
-                       return gyro_y();
+                       return -gyro_y();
                default:
                        return AltosLib.MISSING;
                }
@@ -173,8 +173,9 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
                case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
                        return mag_x();
                case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
-               case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
                        return -mag_y();
+               case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
+                       return mag_y();
                default:
                        return AltosLib.MISSING;
                }
index 98998956bf75ad6544bd51792690456bdc060d40..3ce49499ba3d60359e309df843e18f2cb8d48e2e 100644 (file)
@@ -225,7 +225,7 @@ public class AltosIMU implements Cloneable {
                case imu_type_easymega_v2:
                        return -gyro_y;
                case imu_type_telemega_v4:
-                       return gyro_y;
+                       return -gyro_y;
                default:
                        return AltosLib.MISSING;
                }
@@ -255,9 +255,10 @@ public class AltosIMU implements Cloneable {
                case imu_type_telemega_v3:
                case imu_type_easymega_v1:
                        return mag_x;
-               case imu_type_telemega_v4:
                case imu_type_easymega_v2:
                        return -mag_y;
+               case imu_type_telemega_v4:
+                       return mag_y;
                default:
                        return AltosLib.MISSING;
                }