altoslib: Move CSV/KML output code to altoslib

It's sharable, so share it

Signed-off-by: Keith Packard <keithp@keithp.com>

5 files changed, 10 insertions, 15 deletions

diff --git a/altosui/AltosCSV.java b/altoslib/AltosCSV.java
index 13f29f07..8176d21b 100644
--- a/altosui/AltosCSV.java
+++ b/altoslib/AltosCSV.java
@@ -15,11 +15,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.altoslib_3;
 
 import java.io.*;
 import java.util.*;
-import org.altusmetrum.altoslib_3.*;
 
 public class AltosCSV implements AltosWriter {
 	File			name;
@@ -281,7 +280,7 @@ public class AltosCSV implements AltosWriter {
 	}
 
 	public void write(AltosState state) {
-		if (state.state == Altos.ao_flight_startup)
+		if (state.state == AltosLib.ao_flight_startup)
 			return;
 		if (!header_written) {
 			write_header(state.imu != null || state.mag != null,
@@ -289,7 +288,7 @@ public class AltosCSV implements AltosWriter {
 			header_written = true;
 		}
 		if (!seen_boost) {
-			if (state.state >= Altos.ao_flight_boost) {
+			if (state.state >= AltosLib.ao_flight_boost) {
 				seen_boost = true;
 				boost_tick = state.tick;
 				flush_pad();
diff --git a/altosui/AltosKML.java b/altoslib/AltosKML.java
index ae1f8259..cc9a9f51 100644
--- a/altosui/AltosKML.java
+++ b/altoslib/AltosKML.java
@@ -15,10 +15,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.altoslib_3;
 
 import java.io.*;
-import org.altusmetrum.altoslib_3.*;
 
 public class AltosKML implements AltosWriter {
 
@@ -95,7 +94,7 @@ public class AltosKML implements AltosWriter {
 	boolean	started = false;
 
 	void state_start(AltosState state) {
-		String	state_name = Altos.state_name(state.state);
+		String	state_name = AltosLib.state_name(state.state);
 		out.printf(kml_style_start, state_name, kml_state_colors[state.state]);
 		out.printf("\tState: %s\n", state_name);
 		out.printf("%s", kml_style_end);
diff --git a/altosui/AltosWriter.java b/altoslib/AltosWriter.java
index 5ff44584..0b0daebd 100644
--- a/altosui/AltosWriter.java
+++ b/altoslib/AltosWriter.java
@@ -15,10 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
-
-import org.altusmetrum.altoslib_3.*;
-
+package org.altusmetrum.altoslib_3;
 
 public interface AltosWriter {
 
diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 2ee4d89f..67cc38ff 100644
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -31,6 +31,7 @@ altoslib_JAVA = \
 	AltosConfigValues.java \
 	AltosConvert.java \
 	AltosCRCException.java \
+	AltosCSV.java \
 	AltosDebug.java \
 	AltosEeprom.java \
 	AltosEepromChunk.java \
@@ -62,6 +63,7 @@ altoslib_JAVA = \
 	AltosIdleMonitorListener.java \
 	AltosIgnite.java \
 	AltosIMU.java \
+	AltosKML.java \
 	AltosLine.java \
 	AltosLink.java \
 	AltosListenerState.java \
@@ -114,7 +116,8 @@ altoslib_JAVA = \
 	AltosSpeed.java \
 	AltosTemperature.java \
 	AltosAccel.java \
-	AltosPyro.java
+	AltosPyro.java \
+	AltosWriter.java
 
 JAR=altoslib_$(ALTOSLIB_VERSION).jar
 
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 3a2a1863..76fe9961 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -28,7 +28,6 @@ altosui_JAVA = \
 	AltosConfigureUI.java \
 	AltosConfigTD.java \
 	AltosConfigTDUI.java \
-	AltosCSV.java \
 	AltosCSVUI.java \
 	AltosDescent.java \
 	AltosDeviceUIDialog.java \
@@ -53,7 +52,6 @@ altosui_JAVA = \
 	AltosLaunch.java \
 	AltosLaunchUI.java \
 	AltosInfoTable.java \
-	AltosKML.java \
 	AltosLanded.java \
 	AltosLed.java \
 	AltosLights.java \
@@ -68,7 +66,6 @@ altosui_JAVA = \
 	AltosSiteMapCache.java \
 	AltosSiteMapTile.java \
 	AltosUI.java \
-	AltosWriter.java \
 	AltosGraph.java \
 	AltosGraphDataPoint.java \
 	AltosGraphDataSet.java \