From: Keith Packard <keithp@keithp.com>
Date: Mon, 24 Feb 2020 00:43:23 +0000 (-0800)
Subject: altoslib: Fix Tmega v4 eeprom parsing
X-Git-Tag: 1.9.2~2^2~12
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=017e7ed4d2eea2bbc01972a8dfe11babd42d5993

altoslib: Fix Tmega v4 eeprom parsing

Mangled the source while hacking things somehow; both accel and gyro
corrupted.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altoslib/AltosEepromRecordMega.java b/altoslib/AltosEepromRecordMega.java
index 491e7c3d..ced94298 100644
--- a/altoslib/AltosEepromRecordMega.java
+++ b/altoslib/AltosEepromRecordMega.java
@@ -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_4:
 			return accel_x();
 		case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
 			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();
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
+			return gyro_y();
 		default:
 			return AltosLib.MISSING;
 		}