package altosui;
-import java.lang.*;
import java.io.*;
-import java.text.*;
import java.util.*;
+import org.altusmetrum.altoslib_1.*;
public class AltosCSV implements AltosWriter {
File name;
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(),
}
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();
if (mag == null)
mag = new AltosMag();
- out.printf("%d,%d,%d,%d,%d,%d,%d,%d,%d",
+ out.printf("%6d,%6d,%6d,%6d,%6d,%6d,%6d,%6d,%6d",
imu.accel_x, imu.accel_y, imu.accel_z,
imu.gyro_x, imu.gyro_y, imu.gyro_z,
mag.x, mag.y, mag.z);
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(",");
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;
}