From: Keith Packard <keithp@keithp.com>
Date: Tue, 3 Jan 2012 05:08:34 +0000 (-0800)
Subject: altosui: Move AltosEepromTeleScience.java to altoslib
X-Git-Tag: 1.0.9.6~114
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=027863b737190bccc3b5cd032d77587396d0c5c4

altosui: Move AltosEepromTeleScience.java to altoslib

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

diff --git a/altosui/AltosEepromTeleScience.java b/altosui/AltosEepromTeleScience.java
deleted file mode 100644
index 0c237e11..00000000
--- a/altosui/AltosEepromTeleScience.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright © 2011 Keith Packard <keithp@keithp.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
-
-public class AltosEepromTeleScience {
-	int	type;
-	int	tick;
-	int	tm_state;
-	int	tm_tick;
-	int[]	data;
-	boolean	valid;
-
-	static final int AO_LOG_TELESCIENCE_START = 's';
-	static final int AO_LOG_TELESCIENCE_DATA = 'd';
-
-	static final int	max_data = 12;
-	static final int	record_length = 32;
-
-	public AltosEepromTeleScience (AltosEepromChunk chunk, int start) throws ParseException {
-		type = chunk.data(start);
-
-		valid = !chunk.erased(start, record_length);
-		if (valid) {
-			if (AltosConvert.checksum(chunk.data, start, record_length) != 0)
-				throw new ParseException(String.format("invalid checksum at 0x%x",
-								       chunk.address + start), 0);
-		} else {
-			type = Altos.AO_LOG_INVALID;
-		}
-
-		tick = chunk.data16(start+2);
-		tm_tick = chunk.data16(start+4);
-		tm_state = chunk.data(start+6);
-		data = new int[max_data];
-		for (int i = 0; i < max_data; i++)
-			data[i] = chunk.data16(start + 8 + i * 2);
-	}
-}
diff --git a/altosui/altoslib/Makefile.am b/altosui/altoslib/Makefile.am
index 32f0ecfb..6f8c028a 100644
--- a/altosui/altoslib/Makefile.am
+++ b/altosui/altoslib/Makefile.am
@@ -18,6 +18,7 @@ AltosLib_JAVA = \
 	$(SRC)/AltosEepromIterable.java \
 	$(SRC)/AltosEepromLog.java \
 	$(SRC)/AltosEepromRecord.java \
+	$(SRC)/AltosEepromTeleScience.java \
 	$(SRC)/AltosFrequency.java \
 	$(SRC)/AltosGPS.java \
 	$(SRC)/AltosGPSSat.java \
diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java
new file mode 100644
index 00000000..1758fa34
--- /dev/null
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2011 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosLib;
+
+import java.io.*;
+import java.util.*;
+import java.text.*;
+import java.util.prefs.*;
+import java.util.concurrent.*;
+
+public class AltosEepromTeleScience {
+	public int	type;
+	public int	tick;
+	public int	tm_state;
+	public int	tm_tick;
+	public int[]	data;
+	public boolean	valid;
+
+	public static final int AO_LOG_TELESCIENCE_START = 's';
+	public static final int AO_LOG_TELESCIENCE_DATA = 'd';
+
+	static final int	max_data = 12;
+	public static final int	record_length = 32;
+
+	public AltosEepromTeleScience (AltosEepromChunk chunk, int start) throws ParseException {
+		type = chunk.data(start);
+
+		valid = !chunk.erased(start, record_length);
+		if (valid) {
+			if (AltosConvert.checksum(chunk.data, start, record_length) != 0)
+				throw new ParseException(String.format("invalid checksum at 0x%x",
+								       chunk.address + start), 0);
+		} else {
+			type = AltosLib.AO_LOG_INVALID;
+		}
+
+		tick = chunk.data16(start+2);
+		tm_tick = chunk.data16(start+4);
+		tm_state = chunk.data(start+6);
+		data = new int[max_data];
+		for (int i = 0; i < max_data; i++)
+			data[i] = chunk.data16(start + 8 + i * 2);
+	}
+}