X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromRecordMega.java;h=6b28c50a42e67a935ad7ab723153bb8c996c3a80;hp=18d435afd7f582c73658c1f7cb2619dcc239188a;hb=408badbef80d7a3412b5ad92b269be19d0faaa09;hpb=32de85691f2e4ed1430a259e05a514ad820b32d9

diff --git a/altoslib/AltosEepromRecordMega.java b/altoslib/AltosEepromRecordMega.java
index 18d435af..6b28c50a 100644
--- a/altoslib/AltosEepromRecordMega.java
+++ b/altoslib/AltosEepromRecordMega.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 public class AltosEepromRecordMega extends AltosEepromRecord {
 	public static final int	record_length = 32;
@@ -31,6 +31,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 	private int ground_roll() {
 		switch (log_format) {
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
 			return data32(16);
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
 			return data16(14);
@@ -41,6 +42,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 	private int ground_pitch() {
 		switch (log_format) {
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
 			return data32(20);
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
 			return data16(16);
@@ -51,6 +53,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 	private int ground_yaw() {
 		switch (log_format) {
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
 			return data32(24);
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
 			return data16(18);
@@ -73,8 +76,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 */
@@ -142,8 +145,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)
@@ -188,7 +191,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 			listener.set_pyro_fired(pyro());
 			break;
 		case AltosLib.AO_LOG_GPS_TIME:
-			gps = cal_data.make_temp_gps(tick(), false);
+			gps = listener.make_temp_gps(false);
 			gps.lat = latitude() / 1e7;
 			gps.lon = longitude() / 1e7;
 
@@ -231,7 +234,7 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 			}
 			break;
 		case AltosLib.AO_LOG_GPS_SAT:
-			gps = cal_data.make_temp_gps(tick(), true);
+			gps = listener.make_temp_gps(true);
 
 			int n = nsat();
 			if (n > max_sat)
@@ -249,12 +252,12 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
 		return new AltosEepromRecordMega(eeprom, s);
 	}
 
-	public AltosEepromRecordMega(AltosEepromNew eeprom, int start) {
+	public AltosEepromRecordMega(AltosEeprom eeprom, int start) {
 		super(eeprom, start, record_length);
 		log_format = eeprom.config_data().log_format;
 	}
 
-	public AltosEepromRecordMega(AltosEepromNew eeprom) {
+	public AltosEepromRecordMega(AltosEeprom eeprom) {
 		this(eeprom, 0);
 	}
 }