altoslib: Parse remaining mega AO_LOG_FLIGNT and AO_LOG_GPS_TIME fields

[fw/altos] / altoslib / AltosEepromMega.java

diff --git a/altoslib/AltosEepromMega.java b/altoslib/AltosEepromMega.java
index bccfc62103b947044365b364412ce236aada0ae5..f0d7097e990c58e60359fb3279e8a5187fa54375 100644 (file)
--- 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_1;
+package org.altusmetrum.altoslib_3;
 
 import java.io.*;
 import java.util.*;
@@ -24,13 +24,20 @@ import java.text.*;
 public class AltosEepromMega extends AltosEeprom {
        public static final int record_length = 32;
 
+       public static final int max_sat = 12;
+
        public int record_length() { return record_length; }
 
        /* AO_LOG_FLIGHT elements */
        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); }
@@ -68,7 +75,14 @@ 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); }
+
        /* AO_LOG_GPS_SAT elements */
        public int nsat() { return data16(0); }
        public int svid(int n) { return data8(2 + n * 2); }
@@ -104,7 +118,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);
@@ -115,19 +128,19 @@ public class AltosEepromMega extends AltosEeprom {
                        state.set_ms5607(pres(), temp());
 
                        AltosIMU imu = new AltosIMU();
-                       imu.accel_x = accel_x();
-                       imu.accel_y = accel_y();
-                       imu.accel_z = accel_z();
+                       imu.accel_x = AltosIMU.convert_accel(accel_x());
+                       imu.accel_y = AltosIMU.convert_accel(accel_y());
+                       imu.accel_z = AltosIMU.convert_accel(accel_z());
 
-                       imu.gyro_x = gyro_x();
-                       imu.gyro_y = gyro_y();
-                       imu.gyro_z = gyro_z();
+                       imu.gyro_x = AltosIMU.convert_gyro(gyro_x());
+                       imu.gyro_y = AltosIMU.convert_gyro(gyro_y());
+                       imu.gyro_z = AltosIMU.convert_gyro(gyro_z());
                        state.imu = imu;
 
                        AltosMag mag = new AltosMag();
-                       mag.x = mag_x();
-                       mag.y = mag_y();
-                       mag.z = mag_z();
+                       mag.x = AltosMag.convert_gauss(mag_x());
+                       mag.y = AltosMag.convert_gauss(mag_y());
+                       mag.z = AltosMag.convert_gauss(mag_z());
 
                        state.mag = mag;
 
@@ -148,6 +161,7 @@ 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);
@@ -167,15 +181,22 @@ public class AltosEepromMega extends AltosEeprom {
                        gps.nsat = (flags & AltosLib.AO_GPS_NUM_SAT_MASK) >>
                                AltosLib.AO_GPS_NUM_SAT_SHIFT;
 
-                       gps.year = year();
+                       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;
+                       gps.hdop = hdop();
+                       gps.vdop = vdop();
                        break;
                case AltosLib.AO_LOG_GPS_SAT:
                        state.set_tick(tick);
                        gps = state.make_temp_gps(true);
 
                        int n = nsat();
+                       if (n > max_sat)
+                               n = max_sat;
                        for (int i = 0; i < n; i++)
                                gps.add_sat(svid(i), c_n(i));
                        break;