projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: megametrum depends on ao_companion.h
[fw/altos]
/
altosui
/
AltosCSV.java
diff --git
a/altosui/AltosCSV.java
b/altosui/AltosCSV.java
index be86a4544855d602655646b39b6664d7dd405290..c876d9cabe9a1073fb37eb62641ead19acc8e28c 100644
(file)
--- a/
altosui/AltosCSV.java
+++ b/
altosui/AltosCSV.java
@@
-146,8
+146,8
@@
public class AltosCSV implements AltosWriter {
}
void write_advanced(AltosRecord record) {
}
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 (imu == null)
imu = new AltosIMU();
@@
-263,7
+263,7
@@
public class AltosCSV implements AltosWriter {
write_general(record); out.printf(",");
write_flight(record); out.printf(",");
write_basic(record); out.printf(",");
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(",");
write_advanced(record);
if (record.gps != null) {
out.printf(",");
@@
-287,7
+287,7
@@
public class AltosCSV implements AltosWriter {
if (record.state == Altos.ao_flight_startup)
return;
if (!header_written) {
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;
}
record.gps != null, record.companion != null);
header_written = true;
}