import java.text.*;
import java.util.*;
-import altosui.AltosRecord;
-import altosui.AltosReader;
-
-public class AltosCSV {
+public class AltosCSV implements AltosWriter {
File name;
PrintStream out;
boolean header_written;
LinkedList<AltosRecord> pad_records;
AltosState state;
- static final int ALTOS_CSV_VERSION = 1;
+ static final int ALTOS_CSV_VERSION = 2;
- /* Version 1 format:
+ /* Version 2 format:
*
* General info
* version number
* callsign
* time (seconds since boost)
* rssi
+ * link quality
*
* Flight status
* state
* 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",
- record.version, record.serial, record.flight, record.callsign,
+ out.printf("%s, %d, %d, %s, %8.2f, %4d, %3d",
+ ALTOS_CSV_VERSION, record.serial, record.flight, record.callsign,
(double) record.time,
- record.rssi);
+ record.rssi,
+ record.status & 0x7f);
}
void write_flight_header() {
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(),
}
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) {
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,
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_flight_header();
out.printf(","); write_basic_header();
out.printf(","); write_gps_header();
+ out.printf(","); write_gps_sat_header();
out.printf ("\n");
}
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");
}
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 {