ao-tools: Add TMv2 and Tgps log formats to cc.h

[fw/altos] / altoslib / AltosEepromMega.java

diff --git a/altoslib/AltosEepromMega.java b/altoslib/AltosEepromMega.java
index 1616de771ef2cdbdcea4b6607a2f88549968ffbf..adaa7f3197f84a1a0d1a5a9b99518fed9bcfa53d 100644 (file)
--- a/altoslib/AltosEepromMega.java
+++ b/altoslib/AltosEepromMega.java
@@ -67,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); }
@@ -82,6 +82,7 @@ public class AltosEepromMega extends AltosEeprom {
        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); }
@@ -168,7 +169,11 @@ public class AltosEepromMega extends AltosEeprom {
                        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();