X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromRecordMega.java;h=b858e7098d7f8907938fd8da40c3ccc7e04bc827;hb=075999e274dd1815b15c0d717d1af4e7717e5da9;hp=491e7c3d611f71ced0314ecb9679b1346d593cb1;hpb=06cf43cea9149f8c04c80785a613408454eab4f2;p=fw%2Faltos

diff --git a/altoslib/AltosEepromRecordMega.java b/altoslib/AltosEepromRecordMega.java
index 491e7c3d..b858e709 100644
--- a/altoslib/AltosEepromRecordMega.java
+++ b/altoslib/AltosEepromRecordMega.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 public class AltosEepromRecordMega extends AltosEepromRecord {
 	public static final int	record_length = 32;
@@ -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;
 		}
@@ -171,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;
 		}
@@ -284,16 +287,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 					 cal_data.mag_across(mag_across),
 					 cal_data.mag_through(mag_through));
 
-
-			final double lsb_per_g = 1920.0/105.5;
-
-			double acceleration = AltosConvert.acceleration_from_sensor(
-				accel(),
-				cal_data.ground_accel,
-				cal_data.ground_accel + 2 * lsb_per_g,
-				cal_data.ground_accel);
-
-			listener.set_acceleration(acceleration);
+			listener.set_acceleration(cal_data.acceleration(accel()));
 			break;
 		case AltosLib.AO_LOG_TEMP_VOLT:
 			listener.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));