Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosCSV.java

diff --git a/altoslib/AltosCSV.java b/altoslib/AltosCSV.java
index 4a9278d901fefd1348120d4a5d72d4f75991cf8f..edb23e69f93183eb80f31f7785cb31741d655ff0 100644 (file)
--- a/altoslib/AltosCSV.java
+++ b/altoslib/AltosCSV.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
@@ -158,21 +158,14 @@ public class AltosCSV implements AltosWriter {
        }
 
        void write_advanced_header() {
-               out.printf("accel_x,accel_y,accel_z,gyro_x,gyro_y,gyro_z");
+               out.printf("accel_x,accel_y,accel_z,gyro_x,gyro_y,gyro_z,mag_x,mag_y,mag_z");
        }
 
        void write_advanced(AltosState state) {
-               AltosIMU        imu = state.imu;
-               AltosMag        mag = state.mag;
-
-               if (imu == null)
-                       imu = new AltosIMU();
-               if (mag == null)
-                       mag = new AltosMag();
                out.printf("%7.2f,%7.2f,%7.2f,%7.2f,%7.2f,%7.2f,%7.2f,%7.2f,%7.2f",
-                          imu.accel_x, imu.accel_y, imu.accel_z,
-                          imu.gyro_x, imu.gyro_y, imu.gyro_z,
-                          mag.x, mag.y, mag.z);
+                          state.accel_along(), state.accel_across(), state.accel_through(),
+                          state.gyro_roll(), state.gyro_pitch(), state.gyro_yaw(),
+                          state.mag_along(), state.mag_across(), state.mag_through());
        }
 
        void write_gps_header() {
@@ -381,7 +374,7 @@ public class AltosCSV implements AltosWriter {
                                has_basic = true;
                        if (state.battery_voltage != AltosLib.MISSING)
                                has_battery = true;
-                       if (state.imu != null || state.mag != null)
+                       if (state.accel_across() != AltosLib.MISSING)
                                has_advanced = true;
                        if (state.gps != null) {
                                has_gps = true;