X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosCSV.java;h=765eb44598f337b6fd9e58da4413c5346a021ebf;hb=HEAD;hp=d09ad93b11ac6ce9a88eb1d76cc21a92219415c3;hpb=52149fd81df45f37f5097850795f290f463c43ef;p=fw%2Faltos

diff --git a/altoslib/AltosCSV.java b/altoslib/AltosCSV.java
index d09ad93b..ffa4e37c 100644
--- a/altoslib/AltosCSV.java
+++ b/altoslib/AltosCSV.java
@@ -28,15 +28,21 @@ public class AltosCSV implements AltosWriter {
 	boolean			seen_boost;
 	int			boost_tick;
 
+	boolean			has_call;
 	boolean			has_basic;
+	boolean			has_accel;
+	boolean			has_baro;
+	boolean			has_pyro;
 	boolean			has_radio;
 	boolean			has_battery;
 	boolean			has_flight_state;
-	boolean			has_advanced;
+	boolean			has_3d_accel;
+	boolean			has_imu;
 	boolean			has_igniter;
 	boolean			has_gps;
 	boolean			has_gps_sat;
 	boolean			has_companion;
+	boolean			has_motor_pressure;
 
 	AltosFlightSeries	series;
 	int[]			indices;
@@ -126,7 +132,10 @@ public class AltosCSV implements AltosWriter {
 	 */
 
 	void write_general_header() {
-		out.printf("version,serial,flight,call,time");
+		out.printf(Locale.ROOT,"version,serial,flight");
+		if (series.cal_data().callsign != null)
+			out.printf(Locale.ROOT,",call");
+		out.printf(Locale.ROOT,",time");
 	}
 
 	double time() {
@@ -134,16 +143,17 @@ public class AltosCSV implements AltosWriter {
 	}
 
 	void write_general() {
-		out.printf("%s, %d, %d, %s, %8.2f",
+		out.printf(Locale.ROOT,"%s, %d, %d",
 			   ALTOS_CSV_VERSION,
 			   series.cal_data().serial,
-			   series.cal_data().flight,
-			   series.cal_data().callsign,
-			   time());
+			   series.cal_data().flight);
+		if (series.cal_data().callsign != null)
+			out.printf(Locale.ROOT,",%s", series.cal_data().callsign);
+		out.printf(Locale.ROOT,", %8.2f", time());
 	}
 
 	void write_radio_header() {
-		out.printf("rssi,lqi");
+		out.printf(Locale.ROOT,"rssi,lqi");
 	}
 
 	int rssi() {
@@ -155,12 +165,12 @@ public class AltosCSV implements AltosWriter {
 	}
 
 	void write_radio() {
-		out.printf("%4d, %3d",
+		out.printf(Locale.ROOT,"%4d, %3d",
 			   rssi(), status() & 0x7f);
 	}
 
 	void write_flight_header() {
-		out.printf("state,state_name");
+		out.printf(Locale.ROOT,"state,state_name");
 	}
 
 	int state() {
@@ -169,11 +179,19 @@ public class AltosCSV implements AltosWriter {
 
 	void write_flight() {
 		int state = state();
-		out.printf("%2d,%8s", state, AltosLib.state_name(state));
+		out.printf(Locale.ROOT,"%2d,%8s", state, AltosLib.state_name(state));
 	}
 
 	void write_basic_header() {
-		out.printf("acceleration,pressure,altitude,height,accel_speed,baro_speed,temperature,drogue_voltage,main_voltage");
+		if (has_accel)
+			out.printf(Locale.ROOT,"acceleration,");
+		if (has_baro)
+			out.printf(Locale.ROOT,"pressure,altitude,");
+		out.printf(Locale.ROOT,"height,speed");
+		if (has_baro)
+			out.printf(Locale.ROOT,",temperature");
+		if (has_pyro)
+			out.printf(Locale.ROOT,",drogue_voltage,main_voltage");
 	}
 
 	double acceleration() { return series.value(AltosFlightSeries.accel_name, indices); }
@@ -186,36 +204,58 @@ public class AltosCSV implements AltosWriter {
 	double main_voltage() { return series.value(AltosFlightSeries.main_voltage_name, indices); }
 
 	void write_basic() {
-		out.printf("%8.2f,%10.2f,%8.2f,%8.2f,%8.2f,%8.2f,%5.1f,%5.2f,%5.2f",
-			   acceleration(),
-			   pressure(),
-			   altitude(),
-			   height(),
-			   speed(),
-			   speed(),
-			   temperature(),
-			   apogee_voltage(),
-			   main_voltage());
+		if (has_accel)
+			out.printf(Locale.ROOT,"%8.2f,", acceleration());
+		if (has_baro)
+			out.printf(Locale.ROOT,"%10.2f,%8.2f,",
+				   pressure(), altitude());
+		out.printf(Locale.ROOT,"%8.2f,%8.2f",
+			   height(), speed());
+		if (has_baro)
+			out.printf(Locale.ROOT,",%5.1f", temperature());
+		if (has_pyro)
+			out.printf(Locale.ROOT,",%5.2f,%5.2f",
+				   apogee_voltage(),
+				   main_voltage());
 	}
 
 	void write_battery_header() {
-		out.printf("battery_voltage");
+		out.printf(Locale.ROOT,"battery_voltage");
 	}
 
 	double battery_voltage() { return series.value(AltosFlightSeries.battery_voltage_name, indices); }
 
 	void write_battery() {
-		out.printf("%5.2f", battery_voltage());
+		out.printf(Locale.ROOT,"%5.2f", battery_voltage());
 	}
 
-	void write_advanced_header() {
-		out.printf("accel_x,accel_y,accel_z,gyro_roll,gyro_pitch,gyro_yaw,mag_x,mag_y,mag_z,tilt");
+	void write_motor_pressure_header() {
+		out.printf(Locale.ROOT,"motor_pressure");
+	}
+
+	double motor_pressure() { return series.value(AltosFlightSeries.motor_pressure_name, indices); }
+
+	void write_motor_pressure() {
+		out.printf(Locale.ROOT,"%10.1f", motor_pressure());
+	}
+
+	void write_3d_accel_header() {
+		out.printf(Locale.ROOT,"accel_x,accel_y,accel_z");
 	}
 
 	double accel_along() { return series.value(AltosFlightSeries.accel_along_name, indices); }
 	double accel_across() { return series.value(AltosFlightSeries.accel_across_name, indices); }
 	double accel_through() { return series.value(AltosFlightSeries.accel_through_name, indices); }
 
+	void write_3d_accel() {
+		out.printf(Locale.ROOT,"%7.2f,%7.2f,%7.2f",
+			   accel_along(), accel_across(), accel_through());
+	}
+
+	void write_imu_header() {
+		out.printf(Locale.ROOT,"gyro_roll,gyro_pitch,gyro_yaw,mag_x,mag_y,mag_z,tilt");
+	}
+
 	double gyro_roll() { return series.value(AltosFlightSeries.gyro_roll_name, indices); }
 	double gyro_pitch() { return series.value(AltosFlightSeries.gyro_pitch_name, indices); }
 	double gyro_yaw() { return series.value(AltosFlightSeries.gyro_yaw_name, indices); }
@@ -226,18 +266,17 @@ public class AltosCSV implements AltosWriter {
 
 	double tilt() { return series.value(AltosFlightSeries.orient_name, indices); }
 
-	void write_advanced() {
-		out.printf("%7.2f,%7.2f,%7.2f,%7.2f,%7.2f,%7.2f,%7.2f,%7.2f,%7.2f,%7.2f",
-			   accel_along(), accel_across(), accel_through(),
+	void write_imu() {
+		out.printf(Locale.ROOT,"%7.2f,%7.2f,%7.2f,%7.2f,%7.2f,%7.2f,%7.2f",
 			   gyro_roll(), gyro_pitch(), gyro_yaw(),
 			   mag_along(), mag_across(), mag_through(),
 			   tilt());
 	}
 
 	void write_igniter_header() {
-		out.printf("pyro");
+		out.printf(Locale.ROOT,"pyro");
 		for (int i = 0; i < series.igniter_voltage.length; i++)
-			out.printf(",%s", AltosLib.igniter_short_name(i));
+			out.printf(Locale.ROOT,",%s", AltosLib.igniter_short_name(i));
 	}
 
 	double pyro() { return series.value(AltosFlightSeries.pyro_voltage_name, indices); }
@@ -245,13 +284,13 @@ public class AltosCSV implements AltosWriter {
 	double igniter_value(int channel) { return series.value(series.igniter_voltage_name(channel), indices);	}
 
 	void write_igniter() {
-		out.printf("%5.2f", pyro());
+		out.printf(Locale.ROOT,"%5.2f", pyro());
 		for (int i = 0; i < series.igniter_voltage.length; i++)
-			out.printf(",%5.2f", igniter_value(i));
+			out.printf(Locale.ROOT,",%5.2f", igniter_value(i));
 	}
 
 	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,pdop,hdop,vdop");
+		out.printf(Locale.ROOT,"connected,locked,nsat,latitude,longitude,altitude,year,month,day,hour,minute,second,pad_dist,pad_range,pad_az,pad_el,pdop,hdop,vdop");
 	}
 
 	void write_gps() {
@@ -267,7 +306,7 @@ public class AltosCSV implements AltosWriter {
 		if (gps == null)
 			gps = new AltosGPS();
 
-		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,%6.1f,%6.1f",
+		out.printf(Locale.ROOT,"%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,%6.1f,%6.1f",
 			   gps.connected?1:0,
 			   gps.locked?1:0,
 			   gps.nsat,
@@ -291,9 +330,9 @@ public class AltosCSV implements AltosWriter {
 
 	void write_gps_sat_header() {
 		for(int i = 1; i <= 32; i++) {
-			out.printf("sat%02d", i);
+			out.printf(Locale.ROOT,"sat%02d", i);
 			if (i != 32)
-				out.printf(",");
+				out.printf(Locale.ROOT,",");
 		}
 	}
 
@@ -310,15 +349,15 @@ public class AltosCSV implements AltosWriter {
 			}
 			out.printf ("%3d", c_n0);
 			if (i != 32)
-				out.printf(",");
+				out.printf(Locale.ROOT,",");
 		}
 	}
 
 	void write_companion_header() {
 /*
-		out.printf("companion_id,companion_time,companion_update,companion_channels");
+		out.printf(Locale.ROOT,"companion_id,companion_time,companion_update,companion_channels");
 		for (int i = 0; i < 12; i++)
-			out.printf(",companion_%02d", i);
+			out.printf(Locale.ROOT,",companion_%02d", i);
 */
 	}
 
@@ -328,57 +367,65 @@ public class AltosCSV implements AltosWriter {
 
 		int	channels_written = 0;
 		if (companion == null) {
-			out.printf("0,0,0,0");
+			out.printf(Locale.ROOT,"0,0,0,0");
 		} else {
-			out.printf("%3d,%5.2f,%5.2f,%2d",
+			out.printf(Locale.ROOT,"%3d,%5.2f,%5.2f,%2d",
 				   companion.board_id,
 				   (companion.tick - boost_tick) / 100.0,
 				   companion.update_period / 100.0,
 				   companion.channels);
 			for (; channels_written < companion.channels; channels_written++)
-				out.printf(",%5d", companion.companion_data[channels_written]);
+				out.printf(Locale.ROOT,",%5d", companion.companion_data[channels_written]);
 		}
 		for (; channels_written < 12; channels_written++)
-			out.printf(",0");
+			out.printf(Locale.ROOT,",0");
 */
 	}
 
 	void write_header() {
-		out.printf("#"); write_general_header();
+		out.printf(Locale.ROOT,"#"); write_general_header();
 		if (has_radio) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_radio_header();
 		}
 		if (has_flight_state) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_flight_header();
 		}
 		if (has_basic) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_basic_header();
 		}
 		if (has_battery) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_battery_header();
 		}
-		if (has_advanced) {
-			out.printf(",");
-			write_advanced_header();
+		if (has_motor_pressure) {
+			out.printf(Locale.ROOT,",");
+			write_motor_pressure_header();
+		}
+		if (has_3d_accel) {
+			out.printf(Locale.ROOT,",");
+			write_3d_accel_header();
+		}
+		if (has_imu) {
+			out.printf(Locale.ROOT,",");
+			write_imu_header();
 		}
 		if (has_igniter) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_igniter_header();
 		}
 		if (has_gps) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_gps_header();
 		}
 		if (has_gps_sat) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_gps_sat_header();
 		}
 		if (has_companion) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_companion_header();
 		}
 		out.printf ("\n");
@@ -387,39 +434,47 @@ public class AltosCSV implements AltosWriter {
 	void write_one() {
 		write_general();
 		if (has_radio) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_radio();
 		}
 		if (has_flight_state) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_flight();
 		}
 		if (has_basic) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_basic();
 		}
 		if (has_battery) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_battery();
 		}
-		if (has_advanced) {
-			out.printf(",");
-			write_advanced();
+		if (has_motor_pressure) {
+			out.printf(Locale.ROOT,",");
+			write_motor_pressure();
+		}
+		if (has_3d_accel) {
+			out.printf(Locale.ROOT,",");
+			write_3d_accel();
+		}
+		if (has_imu) {
+			out.printf(Locale.ROOT,",");
+			write_imu();
 		}
 		if (has_igniter) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_igniter();
 		}
 		if (has_gps) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_gps();
 		}
 		if (has_gps_sat) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_gps_sat();
 		}
 		if (has_companion) {
-			out.printf(",");
+			out.printf(Locale.ROOT,",");
 			write_companion();
 		}
 		out.printf ("\n");
@@ -453,8 +508,13 @@ public class AltosCSV implements AltosWriter {
 		has_radio = false;
 		has_flight_state = false;
 		has_basic = false;
+		has_accel = false;
+		has_baro = false;
+		has_pyro = false;
 		has_battery = false;
-		has_advanced = false;
+		has_motor_pressure = false;
+		has_3d_accel = false;
+		has_imu = false;
 		has_igniter = false;
 		has_gps = false;
 		has_gps_sat = false;
@@ -464,12 +524,24 @@ public class AltosCSV implements AltosWriter {
 			has_radio = true;
 		if (series.has_series(AltosFlightSeries.state_name))
 			has_flight_state = true;
-		if (series.has_series(AltosFlightSeries.accel_name) || series.has_series(AltosFlightSeries.pressure_name))
+		if (series.has_series(AltosFlightSeries.accel_name)) {
+			has_basic = true;
+			has_accel = true;
+		}
+		if (series.has_series(AltosFlightSeries.pressure_name)) {
 			has_basic = true;
+			has_baro = true;
+		}
+		if (series.has_series(AltosFlightSeries.apogee_voltage_name))
+			has_pyro = true;
 		if (series.has_series(AltosFlightSeries.battery_voltage_name))
 			has_battery = true;
+		if (series.has_series(AltosFlightSeries.motor_pressure_name))
+			has_motor_pressure = true;
 		if (series.has_series(AltosFlightSeries.accel_across_name))
-			has_advanced = true;
+			has_3d_accel = true;
+		if (series.has_series(AltosFlightSeries.gyro_roll_name))
+			has_imu = true;
 		if (series.has_series(AltosFlightSeries.pyro_voltage_name))
 			has_igniter = true;