diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:09:09 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:09:09 -0700 |
| commit | 4ecc53175a5c28cbc1b846c24d83b6adc3afc2ef (patch) | |
| tree | 4c318f3d5b7ef01247531a8ccb8ce3ce211e48b3 /altoslib/AltosCSV.java | |
| parent | 19d25c9f4c80d2c8562fc4abd766a23961167e79 (diff) | |
| parent | a2ea621eac3263348aff50885c79296f8ece26ed (diff) | |
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'altoslib/AltosCSV.java')
| -rw-r--r-- | altoslib/AltosCSV.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/altoslib/AltosCSV.java b/altoslib/AltosCSV.java index edb23e69..8a389812 100644 --- a/altoslib/AltosCSV.java +++ b/altoslib/AltosCSV.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_8; +package org.altusmetrum.altoslib_9; import java.io.*; import java.util.*; @@ -129,7 +129,7 @@ public class AltosCSV implements AltosWriter { } 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() { @@ -326,14 +326,14 @@ public class AltosCSV implements AltosWriter { } 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) { - if (state.state >= AltosLib.ao_flight_boost) { + if (state.state() >= AltosLib.ao_flight_boost) { 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) { - 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; |