altoslib: Fix Tmega v4 eeprom parsing
authorKeith Packard <keithp@keithp.com>
Mon, 24 Feb 2020 00:43:23 +0000 (16:43 -0800)
committerKeith Packard <keithp@keithp.com>
Mon, 24 Feb 2020 00:43:23 +0000 (16:43 -0800)
Mangled the source while hacking things somehow; both accel and gyro
corrupted.

Signed-off-by: Keith Packard <keithp@keithp.com>
altoslib/AltosEepromRecordMega.java

index 491e7c3d611f71ced0314ecb9679b1346d593cb1..ced942984883afc4a925c98b3125103b81d9e729 100644 (file)
@@ -106,9 +106,9 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
                case AltosLib.AO_LOG_FORMAT_TELEMEGA:
                case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
                case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
                case AltosLib.AO_LOG_FORMAT_TELEMEGA:
                case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
                case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
-               case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
                        return accel_x();
                case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
                        return accel_x();
                case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
+               case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
                        return -accel_y();
                default:
                        return AltosLib.MISSING;
                        return -accel_y();
                default:
                        return AltosLib.MISSING;
@@ -141,6 +141,8 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
                        return gyro_x();
                case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
                        return -gyro_y();
                        return gyro_x();
                case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
                        return -gyro_y();
+               case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
+                       return gyro_y();
                default:
                        return AltosLib.MISSING;
                }
                default:
                        return AltosLib.MISSING;
                }