X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromMega.java;h=adaa7f3197f84a1a0d1a5a9b99518fed9bcfa53d;hp=b8a1b9e86dc61ad09403b33c9de4ec54274a3150;hb=e447e1e5c90d3fc1be9c5a1c966c7c688a87ba18;hpb=dd28429405498fca0788ce9c19093898c84b10e5

diff --git a/altoslib/AltosEepromMega.java b/altoslib/AltosEepromMega.java
index b8a1b9e8..adaa7f31 100644
--- a/altoslib/AltosEepromMega.java
+++ b/altoslib/AltosEepromMega.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 import java.util.*;
@@ -32,7 +32,12 @@ public class AltosEepromMega extends AltosEeprom {
 	public int flight() { return data16(0); }
 	public int ground_accel() { return data16(2); }
 	public int ground_pres() { return data32(4); }
-	public int ground_temp() { return data32(8); }
+	public int ground_accel_along() { return data16(8); }
+	public int ground_accel_across() { return data16(10); }
+	public int ground_accel_through() { return data16(12); }
+	public int ground_roll() { return data16(14); }
+	public int ground_pitch() { return data16(16); }
+	public int ground_yaw() { return data16(18); }
 
 	/* AO_LOG_STATE elements */
 	public int state() { return data16(0); }
@@ -62,7 +67,7 @@ public class AltosEepromMega extends AltosEeprom {
 	/* AO_LOG_GPS_TIME elements */
 	public int latitude() { return data32(0); }
 	public int longitude() { return data32(4); }
-	public int altitude() { return data16(8); }
+	public int altitude_low() { return data16(8); }
 	public int hour() { return data8(10); }
 	public int minute() { return data8(11); }
 	public int second() { return data8(12); }
@@ -70,7 +75,15 @@ public class AltosEepromMega extends AltosEeprom {
 	public int year() { return data8(14); }
 	public int month() { return data8(15); }
 	public int day() { return data8(16); }
-	
+	public int course() { return data8(17); }
+	public int ground_speed() { return data16(18); }
+	public int climb_rate() { return data16(20); }
+	public int pdop() { return data8(22); }
+	public int hdop() { return data8(23); }
+	public int vdop() { return data8(24); }
+	public int mode() { return data8(25); }
+	public int altitude_high() { return data16(26); }
+
 	/* AO_LOG_GPS_SAT elements */
 	public int nsat() { return data16(0); }
 	public int svid(int n) { return data8(2 + n * 2); }
@@ -106,7 +119,6 @@ public class AltosEepromMega extends AltosEeprom {
 			state.set_flight(flight());
 			state.set_ground_accel(ground_accel());
 			state.set_ground_pressure(ground_pres());
-			state.set_temperature(ground_temp() / 100.0);
 			break;
 		case AltosLib.AO_LOG_STATE:
 			state.set_tick(tick);
@@ -150,13 +162,18 @@ public class AltosEepromMega extends AltosEeprom {
 				voltages[i] = AltosConvert.mega_pyro_voltage(sense(i));
 
 			state.set_ignitor_voltage(voltages);
+			state.set_pyro_fired(pyro());
 			break;
 		case AltosLib.AO_LOG_GPS_TIME:
 			state.set_tick(tick);
 			gps = state.make_temp_gps(false);
 			gps.lat = latitude() / 1e7;
 			gps.lon = longitude() / 1e7;
-			gps.alt = altitude();
+
+			if (state.altitude_32())
+				gps.alt = (altitude_low() & 0xffff) | (altitude_high() << 16);
+			else
+				gps.alt = altitude_low();
 
 			gps.hour = hour();
 			gps.minute = minute();
@@ -172,6 +189,24 @@ public class AltosEepromMega extends AltosEeprom {
 			gps.year = 2000 + year();
 			gps.month = month();
 			gps.day = day();
+			gps.ground_speed = ground_speed() * 1.0e-2;
+			gps.course = course() * 2;
+			gps.climb_rate = climb_rate() * 1.0e-2;
+			if (state.compare_version("1.4.9") >= 0) {
+				gps.pdop = pdop() / 10.0;
+				gps.hdop = hdop() / 10.0;
+				gps.vdop = vdop() / 10.0;
+			} else {
+				gps.pdop = pdop() / 100.0;
+				if (gps.pdop < 0.8)
+					gps.pdop += 2.56;
+				gps.hdop = hdop() / 100.0;
+				if (gps.hdop < 0.8)
+					gps.hdop += 2.56;
+				gps.vdop = vdop() / 100.0;
+				if (gps.vdop < 0.8)
+					gps.vdop += 2.56;
+			}
 			break;
 		case AltosLib.AO_LOG_GPS_SAT:
 			state.set_tick(tick);