projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Use standard FIPS testing for chaoskey
[fw/altos]
/
altoslib
/
AltosCSV.java
diff --git
a/altoslib/AltosCSV.java
b/altoslib/AltosCSV.java
index 2357dbc77707d6e4bdfb302a40dfdb9f24bc5ddc..b51994563aec8b145a3b13ffd222dce9a692b245 100644
(file)
--- a/
altoslib/AltosCSV.java
+++ b/
altoslib/AltosCSV.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
5
;
+package org.altusmetrum.altoslib_
11
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-129,7
+130,7
@@
public class AltosCSV implements AltosWriter {
}
void write_flight(AltosState state) {
}
void write_flight(AltosState state) {
- out.printf("%d,%8s", state.state, state.state_name());
+ out.printf("%d,%8s", state.state
()
, state.state_name());
}
void write_basic_header() {
}
void write_basic_header() {
@@
-158,7
+159,7
@@
public class AltosCSV implements AltosWriter {
}
void write_advanced_header() {
}
void write_advanced_header() {
- out.printf("accel_x,accel_y,accel_z,gyro_x,gyro_y,gyro_z");
+ out.printf("accel_x,accel_y,accel_z,gyro_x,gyro_y,gyro_z
,mag_x,mag_y,mag_z
");
}
void write_advanced(AltosState state) {
}
void write_advanced(AltosState state) {
@@
-326,14
+327,14
@@
public class AltosCSV implements AltosWriter {
}
private void write(AltosState state) {
}
private void write(AltosState state) {
- if (state.state == AltosLib.ao_flight_startup)
+ if (state.state
()
== AltosLib.ao_flight_startup)
return;
if (!header_written) {
write_header();
header_written = true;
}
if (!seen_boost) {
return;
if (!header_written) {
write_header();
header_written = true;
}
if (!seen_boost) {
- if (state.state >= AltosLib.ao_flight_boost) {
+ if (state.state
()
>= AltosLib.ao_flight_boost) {
seen_boost = true;
boost_tick = state.tick;
flush_pad();
seen_boost = true;
boost_tick = state.tick;
flush_pad();
@@
-368,7
+369,7
@@
public class AltosCSV implements AltosWriter {
has_gps_sat = false;
has_companion = false;
for (AltosState state : states) {
has_gps_sat = false;
has_companion = false;
for (AltosState state : states) {
- if (state.state
!= AltosLib.ao_flight_stateless && state.state != AltosLib.ao_flight_invalid && state.state
!= AltosLib.ao_flight_startup)
+ if (state.state
() != AltosLib.ao_flight_stateless && state.state() != AltosLib.ao_flight_invalid && state.state()
!= AltosLib.ao_flight_startup)
has_flight_state = true;
if (state.acceleration() != AltosLib.MISSING || state.pressure() != AltosLib.MISSING)
has_basic = true;
has_flight_state = true;
if (state.acceleration() != AltosLib.MISSING || state.pressure() != AltosLib.MISSING)
has_basic = true;