X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromRecordMega.java;h=d0da1b7ccf4b48f31f10b4ab9626c036fad08804;hp=371810aba4ba8873be7b6719ef8b41df0327bec7;hb=8da38e5217f366a7da24a8af4a5ca620fad35df3;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859

diff --git a/altoslib/AltosEepromRecordMega.java b/altoslib/AltosEepromRecordMega.java
index 371810ab..d0da1b7c 100644
--- a/altoslib/AltosEepromRecordMega.java
+++ b/altoslib/AltosEepromRecordMega.java
@@ -73,8 +73,8 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 	private int gyro_y() { return data16(16); }
 	private int gyro_z() { return data16(18); }
 	private int mag_x() { return data16(20); }
-	private int mag_y() { return data16(22); }
-	private int mag_z() { return data16(24); }
+	private int mag_z() { return data16(22); }
+	private int mag_y() { return data16(24); }
 	private int accel() { return data16(26); }
 
 	/* AO_LOG_TEMP_VOLT elements */
@@ -114,22 +114,6 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 
 		AltosGPS	gps;
 
-		/* Flush any pending GPS changes */
-		if (cal_data.gps_pending()) {
-			switch (cmd()) {
-			case AltosLib.AO_LOG_GPS_LAT:
-			case AltosLib.AO_LOG_GPS_LON:
-			case AltosLib.AO_LOG_GPS_ALT:
-			case AltosLib.AO_LOG_GPS_SAT:
-			case AltosLib.AO_LOG_GPS_DATE:
-				break;
-			default:
-				listener.set_gps(cal_data.temp_gps());
-				cal_data.reset_temp_gps();
-				break;
-			}
-		}
-
 		switch (cmd()) {
 		case AltosLib.AO_LOG_FLIGHT:
 			cal_data.set_flight(flight());
@@ -158,8 +142,8 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 			int	gyro_pitch = gyro_x();
 			int	gyro_yaw = gyro_z();
 
-			int	mag_along = mag_x();
-			int	mag_across = mag_y();
+			int	mag_along = mag_y();
+			int	mag_across = mag_x();
 			int	mag_through = mag_z();
 
 			if (log_format == AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD)
@@ -177,11 +161,13 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 					 cal_data.mag_through(mag_through));
 
 
+			final double lsb_per_g = 1920.0/105.5;
+
 			double acceleration = AltosConvert.acceleration_from_sensor(
 				accel(),
-				config_data.accel_cal_plus,
-				config_data.accel_cal_minus,
-				AltosLib.MISSING);
+				cal_data.ground_accel,
+				cal_data.ground_accel + 2 * lsb_per_g,
+				cal_data.ground_accel);
 
 			listener.set_acceleration(acceleration);
 			break;
@@ -198,7 +184,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 			for (int i = 0; i < nsense-2; i++)
 				voltages[i] = AltosConvert.mega_pyro_voltage(sense(i));
 
-			listener.set_ignitor_voltage(voltages);
+			listener.set_igniter_voltage(voltages);
 			listener.set_pyro_fired(pyro());
 			break;
 		case AltosLib.AO_LOG_GPS_TIME: