X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosCSV.java;h=13f29f07f686e097f89cf597ad5658d5b44f78cf;hp=0b5a74e964c838224e8ab437480d552c468c9bb8;hb=9cb10d73fee0e3f36c778fd2a9c9992b87669fe2;hpb=de8d9c5630ae46378c50faf97f7d2e97fe139e30

diff --git a/altosui/AltosCSV.java b/altosui/AltosCSV.java
index 0b5a74e9..13f29f07 100644
--- a/altosui/AltosCSV.java
+++ b/altosui/AltosCSV.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.io.*;
 import java.util.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_3.*;
 
 public class AltosCSV implements AltosWriter {
 	File			name;
@@ -127,12 +127,12 @@ public class AltosCSV implements AltosWriter {
 
 	void write_basic(AltosState state) {
 		out.printf("%8.2f,%10.2f,%8.2f,%8.2f,%8.2f,%8.2f,%5.1f,%5.2f,%5.2f,%5.2f",
-			   state.acceleration,
-			   state.pressure,
-			   state.altitude,
-			   state.height,
-			   state.speed,
-			   state.speed,
+			   state.acceleration(),
+			   state.pressure(),
+			   state.altitude(),
+			   state.height(),
+			   state.speed(),
+			   state.speed(),
 			   state.temperature,
 			   state.battery_voltage,
 			   state.apogee_voltage,
@@ -170,7 +170,7 @@ public class AltosCSV implements AltosWriter {
 		if (from_pad == null)
 			from_pad = new AltosGreatCircle();
 
-		out.printf("%2d,%2d,%3d,%12.7f,%12.7f,%6d,%5d,%3d,%3d,%3d,%3d,%3d,%9.0f,%9.0f,%4.0f,%4.0f,%6.1f",
+		out.printf("%2d,%2d,%3d,%12.7f,%12.7f,%8.1f,%5d,%3d,%3d,%3d,%3d,%3d,%9.0f,%9.0f,%4.0f,%4.0f,%6.1f",
 			   gps.connected?1:0,
 			   gps.locked?1:0,
 			   gps.nsat,
@@ -222,7 +222,7 @@ public class AltosCSV implements AltosWriter {
 	}
 
 	void write_companion(AltosState state) {
-		AltosRecordCompanion companion = state.companion;
+		AltosCompanion companion = state.companion;
 
 		int	channels_written = 0;
 		if (companion == null) {