altos/micropeak-v2.0: Add initial MicroPeak v2 support

[fw/altos] / altoslib / AltosEepromChunk.java

diff --git a/altoslib/AltosEepromChunk.java b/altoslib/AltosEepromChunk.java
index 4d12f564057bc92e35ed21ec712269e6bb18f55c..32d9f8eab2efa5066b44213c7881607b003b5f04 100644 (file)
--- a/altoslib/AltosEepromChunk.java
+++ b/altoslib/AltosEepromChunk.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.text.*;
 import java.util.concurrent.*;
@@ -69,24 +70,29 @@ public class AltosEepromChunk {
                        eeprom = new AltosEepromTM(this, offset);
                        break;
                case AltosLib.AO_LOG_FORMAT_TINY:
-                       eeprom = new AltosEepromTm(this, offset, state);
+                       eeprom = new AltosEepromTMini(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);
+               case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
+                       eeprom = new AltosEepromMega(this, offset, log_format);
                        break;
                case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
                        eeprom = new AltosEepromMetrum2(this, offset);
                        break;
-               case AltosLib.AO_LOG_FORMAT_TELEMINI:
+               case AltosLib.AO_LOG_FORMAT_TELEMINI2:
+               case AltosLib.AO_LOG_FORMAT_TELEMINI3:
                case AltosLib.AO_LOG_FORMAT_EASYMINI:
                        eeprom = new AltosEepromMini(this, offset);
                        break;
                case AltosLib.AO_LOG_FORMAT_TELEGPS:
                        eeprom = new AltosEepromGPS(this, offset);
                        break;
+               case AltosLib.AO_LOG_FORMAT_TELEFIRETWO:
+                       eeprom = new AltosEepromFireTwo(this, offset);
+                       break;
                default:
                        throw new ParseException("unknown eeprom format " + log_format, 0);
                }