X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosCSV.java;h=f8cc1ed6b1d12240a34ee74a7b28bfbc1018564c;hp=cf649db0d06b781563f63ece4efabe22da60daec;hb=382c54a0d052c8975b57c995ef83bc8934bde242;hpb=c7f540330c040c521f9d7626009a406e704a5e41

diff --git a/altosui/AltosCSV.java b/altosui/AltosCSV.java
index cf649db0..f8cc1ed6 100644
--- a/altosui/AltosCSV.java
+++ b/altosui/AltosCSV.java
@@ -17,10 +17,9 @@
 
 package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.text.*;
 import java.util.*;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosCSV implements AltosWriter {
 	File			name;
@@ -31,9 +30,9 @@ public class AltosCSV implements AltosWriter {
 	LinkedList<AltosRecord>	pad_records;
 	AltosState		state;
 
-	static final int ALTOS_CSV_VERSION = 3;
+	static final int ALTOS_CSV_VERSION = 5;
 
-	/* Version 3 format:
+	/* Version 4 format:
 	 *
 	 * General info
 	 *	version number
@@ -41,6 +40,7 @@ public class AltosCSV implements AltosWriter {
 	 *	flight number
 	 *	callsign
 	 *	time (seconds since boost)
+	 *	clock (tick count / 100)
 	 *	rssi
 	 *	link quality
 	 *
@@ -60,6 +60,17 @@ public class AltosCSV implements AltosWriter {
 	 *	drogue (V)
 	 *	main (V)
 	 *
+	 * Advanced sensors (if available)
+	 *	accel_x (m/s²)
+	 *	accel_y (m/s²)
+	 *	accel_z (m/s²)
+	 *	gyro_x (d/s)
+	 *	gyro_y (d/s)
+	 *	gyro_z (d/s)
+	 *	mag_x (g)
+	 *	mag_y (g)
+	 *	mag_z (g)
+	 *
 	 * GPS data (if available)
 	 *	connected (1/0)
 	 *	locked (1/0)
@@ -91,13 +102,13 @@ public class AltosCSV implements AltosWriter {
 	 */
 
 	void write_general_header() {
-		out.printf("version,serial,flight,call,time,rssi,lqi");
+		out.printf("version,serial,flight,call,time,clock,rssi,lqi");
 	}
 
 	void write_general(AltosRecord record) {
-		out.printf("%s, %d, %d, %s, %8.2f, %4d, %3d",
+		out.printf("%s, %d, %d, %s, %8.2f, %8.2f, %4d, %3d",
 			   ALTOS_CSV_VERSION, record.serial, record.flight, record.callsign,
-			   (double) record.time,
+			   (double) record.time, (double) record.tick / 100.0,
 			   record.rssi,
 			   record.status & 0x7f);
 	}
@@ -128,6 +139,24 @@ public class AltosCSV implements AltosWriter {
 			   record.main_voltage());
 	}
 
+	void write_advanced_header() {
+		out.printf("accel_x,accel_y,accel_z,gyro_x,gyro_y,gyro_z");
+	}
+
+	void write_advanced(AltosRecord record) {
+		AltosIMU	imu = record.imu();
+		AltosMag	mag = record.mag();
+
+		if (imu == null)
+			imu = new AltosIMU();
+		if (mag == null)
+			mag = new AltosMag();
+		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);
+	}
+
 	void write_gps_header() {
 		out.printf("connected,locked,nsat,latitude,longitude,altitude,year,month,day,hour,minute,second,pad_dist,pad_range,pad_az,pad_el,hdop");
 	}
@@ -211,10 +240,12 @@ public class AltosCSV implements AltosWriter {
 			out.printf(",0");
 	}
 
-	void write_header(boolean gps, boolean companion) {
+	void write_header(boolean advanced, boolean gps, boolean companion) {
 		out.printf("#"); write_general_header();
 		out.printf(","); write_flight_header();
 		out.printf(","); write_basic_header();
+		if (advanced)
+			out.printf(","); write_advanced_header();
 		if (gps) {
 			out.printf(","); write_gps_header();
 			out.printf(","); write_gps_sat_header();
@@ -229,7 +260,9 @@ public class AltosCSV implements AltosWriter {
 		state = new AltosState(record, state);
 		write_general(record); out.printf(",");
 		write_flight(record); out.printf(",");
-		write_basic(record);
+		write_basic(record); out.printf(",");
+		if (record.imu() != null || record.mag() != null)
+			write_advanced(record);
 		if (record.gps != null) {
 			out.printf(",");
 			write_gps(record); out.printf(",");
@@ -252,7 +285,8 @@ public class AltosCSV implements AltosWriter {
 		if (record.state == Altos.ao_flight_startup)
 			return;
 		if (!header_written) {
-			write_header(record.gps != null, record.companion != null);
+			write_header(record.imu() != null || record.mag() != null,
+				     record.gps != null, record.companion != null);
 			header_written = true;
 		}
 		if (!seen_boost) {