projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Finish ms5607 support
[fw/altos]
/
altosui
/
AltosCSV.java
diff --git
a/altosui/AltosCSV.java
b/altosui/AltosCSV.java
index cf649db0d06b781563f63ece4efabe22da60daec..9ec21bef107aa9e2bd35fe0465964ca8e8357731 100644
(file)
--- a/
altosui/AltosCSV.java
+++ b/
altosui/AltosCSV.java
@@
-31,9
+31,9
@@
public class AltosCSV implements AltosWriter {
LinkedList<AltosRecord> pad_records;
AltosState state;
LinkedList<AltosRecord> pad_records;
AltosState state;
- static final int ALTOS_CSV_VERSION =
3
;
+ static final int ALTOS_CSV_VERSION =
4
;
- /* Version
3
format:
+ /* Version
4
format:
*
* General info
* version number
*
* General info
* version number
@@
-41,6
+41,7
@@
public class AltosCSV implements AltosWriter {
* flight number
* callsign
* time (seconds since boost)
* flight number
* callsign
* time (seconds since boost)
+ * clock (tick count / 100)
* rssi
* link quality
*
* rssi
* link quality
*
@@
-91,13
+92,13
@@
public class AltosCSV implements AltosWriter {
*/
void write_general_header() {
*/
void write_general_header() {
- out.printf("version,serial,flight,call,time,rssi,lqi");
+ out.printf("version,serial,flight,call,time,
clock,
rssi,lqi");
}
void write_general(AltosRecord record) {
}
void write_general(AltosRecord record) {
- out.printf("%s, %d, %d, %s, %8.2f, %4d, %3d",
+ out.printf("%s, %d, %d, %s, %8.2f, %
8.2f, %
4d, %3d",
ALTOS_CSV_VERSION, record.serial, record.flight, record.callsign,
ALTOS_CSV_VERSION, record.serial, record.flight, record.callsign,
- (double) record.time,
+ (double) record.time,
(double) record.tick / 100.0,
record.rssi,
record.status & 0x7f);
}
record.rssi,
record.status & 0x7f);
}