projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/chaoskey: Add another USB endpoint to read raw data
[fw/altos]
/
altoslib
/
AltosCSV.java
diff --git
a/altoslib/AltosCSV.java
b/altoslib/AltosCSV.java
index 2ad50097622e01de54be751b47e6f59cff9a6d73..8a389812643af28fd207d5573782967842a5b2a0 100644
(file)
--- a/
altoslib/AltosCSV.java
+++ b/
altoslib/AltosCSV.java
@@
-15,7
+15,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_
9
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-129,7
+129,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() {
@@
-326,14
+326,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
+368,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;