projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Quick hacks to download megametrum data and convert to CSV
[fw/altos]
/
altosui
/
AltosRecord.java
diff --git
a/altosui/AltosRecord.java
b/altosui/AltosRecord.java
index 486c96b2e232d93e7f30fc29e210d02c4dd69a3f..4643d69a308a802f91748b39037c7c3da02d7aef 100644
(file)
--- a/
altosui/AltosRecord.java
+++ b/
altosui/AltosRecord.java
@@
-65,6
+65,10
@@
public class AltosRecord implements Comparable <AltosRecord> {
int flight_pres;
AltosGPS gps;
int flight_pres;
AltosGPS gps;
+ boolean new_gps;
+
+ AltosIMU imu;
+ AltosMag mag;
double time; /* seconds since boost */
double time; /* seconds since boost */
@@
-274,7
+278,10
@@
public class AltosRecord implements Comparable <AltosRecord> {
speed = old.speed;
height = old.height;
gps = new AltosGPS(old.gps);
speed = old.speed;
height = old.height;
gps = new AltosGPS(old.gps);
+ new_gps = false;
companion = old.companion;
companion = old.companion;
+ imu = old.imu;
+ mag = old.mag;
}
public AltosRecord() {
}
public AltosRecord() {
@@
-304,6
+311,7
@@
public class AltosRecord implements Comparable <AltosRecord> {
speed = MISSING;
height = MISSING;
gps = new AltosGPS();
speed = MISSING;
height = MISSING;
gps = new AltosGPS();
+ new_gps = false;
companion = null;
}
}
companion = null;
}
}