X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosCSV.java;h=3a9e48f85eed31ba392b720e51ce4d86267b76f7;hp=4ce8e30e77dece9e86edbc1cc37f3fca1bf9f3de;hb=ce7f59fbfb5a94a67a4ceced3cc371b4c6b6e5d1;hpb=63bd34cd1b5a411489e8c3ab377f0fe0eec11f67

diff --git a/ao-tools/altosui/AltosCSV.java b/ao-tools/altosui/AltosCSV.java
index 4ce8e30e..3a9e48f8 100644
--- a/ao-tools/altosui/AltosCSV.java
+++ b/ao-tools/altosui/AltosCSV.java
@@ -23,7 +23,6 @@ import java.text.*;
 import java.util.*;
 
 import altosui.AltosRecord;
-import altosui.AltosReader;
 
 public class AltosCSV {
 	File			name;
@@ -45,6 +44,7 @@ public class AltosCSV {
 	 *	callsign
 	 *	time (seconds since boost)
 	 *	rssi
+	 *	link quality
 	 *
 	 * Flight status
 	 *	state
@@ -79,25 +79,26 @@ public class AltosCSV {
 	 *	from_pad_azimuth (deg true)
 	 *	from_pad_range (m)
 	 *	from_pad_elevation (deg from horizon)
+	 *	hdop
 	 *
 	 * GPS Sat data
-	 *	hdop
 	 *	C/N0 data for all 32 valid SDIDs
 	 */
 
 	void write_general_header() {
-		out.printf("version serial flight call time rssi");
+		out.printf("version,serial,flight,call,time,rssi,lqi");
 	}
 
 	void write_general(AltosRecord record) {
-		out.printf("%s,%d,%d,%s,%8.2f,%4d",
+		out.printf("%s, %d, %d, %s, %8.2f, %4d, %3d",
 			   record.version, record.serial, record.flight, record.callsign,
 			   (double) record.time,
-			   record.rssi);
+			   record.rssi,
+			   record.status & 0x7f);
 	}
 
 	void write_flight_header() {
-		out.printf("state state_name");
+		out.printf("state,state_name");
 	}
 
 	void write_flight(AltosRecord record) {
@@ -105,15 +106,15 @@ public class AltosCSV {
 	}
 
 	void write_basic_header() {
-		out.printf("acceleration pressure altitude height accel_speed baro_speed temperature battery_voltage drogue_voltage main_voltage");
+		out.printf("acceleration,pressure,altitude,height,accel_speed,baro_speed,temperature,battery_voltage,drogue_voltage,main_voltage");
 	}
 
 	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.pressure(),
-			   record.altitude(),
-			   record.height(),
+			   record.raw_pressure(),
+			   record.raw_altitude(),
+			   record.raw_height(),
 			   record.accel_speed(),
 			   state.baro_speed,
 			   record.temperature(),
@@ -123,7 +124,7 @@ public class AltosCSV {
 	}
 
 	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");
+		out.printf("connected,locked,nsat,latitude,longitude,altitude,year,month,day,hour,minute,second,pad_dist,pad_range,pad_az,pad_el,hdop");
 	}
 
 	void write_gps(AltosRecord record) {
@@ -135,7 +136,7 @@ public class AltosCSV {
 		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",
+		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",
 			   gps.connected?1:0,
 			   gps.locked?1:0,
 			   gps.nsat,
@@ -151,14 +152,41 @@ public class AltosCSV {
 			   from_pad.distance,
 			   state.range,
 			   from_pad.bearing,
-			   state.elevation);
+			   state.elevation,
+			   gps.hdop);
+	}
+
+	void write_gps_sat_header() {
+		for(int i = 1; i <= 32; i++) {
+			out.printf("sat%02d", i);
+			if (i != 32)
+				out.printf(",");
+		}
+	}
+
+	void write_gps_sat(AltosRecord record) {
+		AltosGPS	gps = record.gps;
+		for(int i = 1; i <= 32; i++) {
+			int	c_n0 = 0;
+			if (gps != null && gps.cc_gps_sat != null) {
+				for(int j = 0; j < gps.cc_gps_sat.length; j++)
+					if (gps.cc_gps_sat[j].svid == i) {
+						c_n0 = gps.cc_gps_sat[j].c_n0;
+						break;
+					}
+			}
+			out.printf ("%3d", c_n0);
+			if (i != 32)
+				out.printf(",");
+		}
 	}
 
 	void write_header() {
-		out.printf("# "); write_general_header();
-		out.printf(" "); write_flight_header();
-		out.printf(" "); write_basic_header();
-		out.printf(" "); write_gps_header();
+		out.printf("#"); write_general_header();
+		out.printf(","); write_flight_header();
+		out.printf(","); write_basic_header();
+		out.printf(","); write_gps_header();
+		out.printf(","); write_gps_sat_header();
 		out.printf ("\n");
 	}
 
@@ -167,7 +195,8 @@ public class AltosCSV {
 		write_general(record); out.printf(",");
 		write_flight(record); out.printf(",");
 		write_basic(record); out.printf(",");
-		write_gps(record);
+		write_gps(record); out.printf(",");
+		write_gps_sat(record);
 		out.printf ("\n");
 	}
 
@@ -207,22 +236,10 @@ public class AltosCSV {
 		out.close();
 	}
 
-	public void write(AltosReader reader) {
-		AltosRecord	record;
-
-		reader.write_comments(out());
-		try {
-			for (;;) {
-				record = reader.read();
-				if (record == null)
-					break;
-				write(record);
-			}
-		} catch (IOException ie) {
-			System.out.printf("IOException\n");
-		} catch (ParseException pe) {
-			System.out.printf("ParseException %s\n", pe.getMessage());
-		}
+	public void write(AltosRecordIterable iterable) {
+		iterable.write_comments(out());
+		for (AltosRecord r : iterable)
+			write(r);
 	}
 
 	public AltosCSV(File in_name) throws FileNotFoundException {