X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosCSV.java;h=150f5a6446e18018da3d7bf9bdb5d5d70a00441a;hp=f4e50ff1e7a0cd24efd4f8059a443efc98aaadc7;hb=0afa07d3c1dcb5e301fcb8b4edfecdd961662478;hpb=cb23b992be8ba40c97d8988c134a814a13ccd58c diff --git a/altoslib/AltosCSV.java b/altoslib/AltosCSV.java index f4e50ff1..150f5a64 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_7; +package org.altusmetrum.altoslib_8; 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;