X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosCSV.java;h=0676f99d38fb63478f4da9c32f5a9535e02743d1;hp=be86a4544855d602655646b39b6664d7dd405290;hb=9acd488c5f945511f813d84c3c6f69846d4601e8;hpb=3c2f601139d36761de6a8a2210545d082ef16133

diff --git a/altosui/AltosCSV.java b/altosui/AltosCSV.java
index be86a454..0676f99d 100644
--- a/altosui/AltosCSV.java
+++ b/altosui/AltosCSV.java
@@ -17,11 +17,9 @@
 
 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(),
@@ -146,8 +144,8 @@ public class AltosCSV implements AltosWriter {
 	}
 
 	void write_advanced(AltosRecord record) {
-		AltosIMU	imu = record.imu;
-		AltosMag	mag = record.mag;
+		AltosIMU	imu = record.imu();
+		AltosMag	mag = record.mag();
 
 		if (imu == null)
 			imu = new AltosIMU();
@@ -263,7 +261,7 @@ public class AltosCSV implements AltosWriter {
 		write_general(record); out.printf(",");
 		write_flight(record); out.printf(",");
 		write_basic(record); out.printf(",");
-		if (record.imu != null || record.mag != null)
+		if (record.imu() != null || record.mag() != null)
 			write_advanced(record);
 		if (record.gps != null) {
 			out.printf(",");
@@ -287,7 +285,7 @@ public class AltosCSV implements AltosWriter {
 		if (record.state == Altos.ao_flight_startup)
 			return;
 		if (!header_written) {
-			write_header(record.imu != null || record.mag != null,
+			write_header(record.imu() != null || record.mag() != null,
 				     record.gps != null, record.companion != null);
 			header_written = true;
 		}