diff options
| author | Keith Packard <keithp@keithp.com> | 2012-01-02 21:08:34 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-01-02 21:08:34 -0800 |
| commit | 5b3b202f27e2ae0eb1132b6cd1e054178569ca66 (patch) | |
| tree | 6c5f40f01f35afbd12d5896d4d710cae32a734db | |
| parent | bd032bfa7e14d7475be4df17b61ee428351e18a7 (diff) | |
altosui: Move AltosEepromTeleScience.java to altoslib
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altosui/Makefile.am | 1 | ||||
| -rw-r--r-- | altosui/altoslib/Makefile.am | 1 | ||||
| -rw-r--r-- | altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java (renamed from altosui/AltosEepromTeleScience.java) | 28 |
3 files changed, 12 insertions, 18 deletions
diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 2796bc0a..8ea84825 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -38,7 +38,6 @@ altosui_JAVA = \ AltosEepromList.java \ AltosEepromManage.java \ AltosEepromMonitor.java \ - AltosEepromTeleScience.java \ AltosEepromSelect.java \ AltosFile.java \ AltosFlash.java \ 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/AltosEepromTeleScience.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java index 0c237e11..1758fa34 100644 --- a/altosui/AltosEepromTeleScience.java +++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosEepromTeleScience.java @@ -15,33 +15,27 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package org.altusmetrum.AltosLib; -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; + public int type; + public int tick; + public int tm_state; + public int tm_tick; + public int[] data; + public boolean valid; - static final int AO_LOG_TELESCIENCE_START = 's'; - static final int AO_LOG_TELESCIENCE_DATA = 'd'; + public static final int AO_LOG_TELESCIENCE_START = 's'; + public static final int AO_LOG_TELESCIENCE_DATA = 'd'; static final int max_data = 12; - static final int record_length = 32; + public static final int record_length = 32; public AltosEepromTeleScience (AltosEepromChunk chunk, int start) throws ParseException { type = chunk.data(start); @@ -52,7 +46,7 @@ public class AltosEepromTeleScience { throw new ParseException(String.format("invalid checksum at 0x%x", chunk.address + start), 0); } else { - type = Altos.AO_LOG_INVALID; + type = AltosLib.AO_LOG_INVALID; } tick = chunk.data16(start+2); |