Merge branch 'telescience-v0.2'

[fw/altos] / altosui / AltosCSV.java

diff --git a/altosui/AltosCSV.java b/altosui/AltosCSV.java
index c672b78f27ef97f4f5c74ff783701b02b3ad5577..0676f99d38fb63478f4da9c32f5a9535e02743d1 100644 (file)
--- a/altosui/AltosCSV.java
+++ b/altosui/AltosCSV.java
@@ -15,13 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package AltosUI;
+package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.text.*;
 import java.util.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosCSV implements AltosWriter {
        File                    name;
@@ -130,10 +128,10 @@ public class AltosCSV implements AltosWriter {
        void write_basic(AltosRecord record) {
                out.printf("%8.2f,%10.2f,%8.2f,%8.2f,%8.2f,%8.2f,%5.1f,%5.2f,%5.2f,%5.2f",
                           record.acceleration(),
-                          record.raw_pressure(),
-                          record.raw_altitude(),
-                          record.raw_height(),
-                          record.accel_speed(),
+                          record.pressure(),
+                          record.altitude(),
+                          record.height(),
+                          state.accel_speed,
                           state.baro_speed,
                           record.temperature(),
                           record.battery_voltage(),