diff options
author | Bdale Garbee <bdale@gag.com> | 2013-12-19 01:38:40 -0700 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2013-12-19 01:38:40 -0700 |
commit | 575bbaf976c5840fd0e308549c45a466fdec1352 (patch) | |
tree | 11bfb498348bf7687bffc24699c4b1a998988ee4 /altoslib/AltosEepromChunk.java | |
parent | b825116df173b77e2cab217a7b76112c742f9279 (diff) | |
parent | bc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3 (diff) |
Merge branch 'branch-1.3' into debian
Conflicts:
ChangeLog
altoslib/AltosRecordMM.java
altosui/Makefile.am
altosui/altos-windows.nsi.in
configure.ac
debian/changelog
debian/control
doc/Makefile
doc/altusmetrum.xsl
doc/release-notes-1.2.1.xsl
doc/release-notes-1.2.xsl
Diffstat (limited to 'altoslib/AltosEepromChunk.java')
-rw-r--r-- | altoslib/AltosEepromChunk.java | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/altoslib/AltosEepromChunk.java b/altoslib/AltosEepromChunk.java index b1bba3bb..c03fa931 100644 --- a/altoslib/AltosEepromChunk.java +++ b/altoslib/AltosEepromChunk.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_1; +package org.altusmetrum.altoslib_2; import java.text.*; import java.util.concurrent.*; @@ -62,6 +62,34 @@ public class AltosEepromChunk { return true; } + public AltosEeprom eeprom(int offset, int log_format, AltosState state) throws ParseException { + AltosEeprom eeprom = null; + switch (log_format) { + case AltosLib.AO_LOG_FORMAT_FULL: + eeprom = new AltosEepromTM(this, offset); + break; + case AltosLib.AO_LOG_FORMAT_TINY: + eeprom = new AltosEepromTm(this, offset, state); + break; + case AltosLib.AO_LOG_FORMAT_TELEMETRY: + case AltosLib.AO_LOG_FORMAT_TELESCIENCE: + break; + case AltosLib.AO_LOG_FORMAT_TELEMEGA: + eeprom = new AltosEepromMega(this, offset); + break; + case AltosLib.AO_LOG_FORMAT_TELEMETRUM: + eeprom = new AltosEepromMetrum2(this, offset); + break; + case AltosLib.AO_LOG_FORMAT_TELEMINI: + case AltosLib.AO_LOG_FORMAT_EASYMINI: + eeprom = new AltosEepromMini(this, offset); + break; + default: + throw new ParseException("unknown eeprom format " + log_format, 0); + } + return eeprom; + } + public AltosEepromChunk(AltosLink link, int block, boolean flush) throws TimeoutException, InterruptedException { |