X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosCSV.java;h=b51994563aec8b145a3b13ffd222dce9a692b245;hb=6804ead7f7e54ff34b257e10e381dc52d5a61b06;hp=2ad50097622e01de54be751b47e6f59cff9a6d73;hpb=4d4fee0b0091a1b6257a06f62b1078778cdb417f;p=fw%2Faltos

diff --git a/altoslib/AltosCSV.java b/altoslib/AltosCSV.java
index 2ad50097..b5199456 100644
--- 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
- * 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
@@ -15,7 +16,7 @@
  * 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.*;
@@ -129,7 +130,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 +327,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 +369,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;