altoslib: Fix parsing of old TM log GPS sat data

[fw/altos] / altoslib / AltosEepromRecordSet.java

diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java
index 0c60c1a5ab5b8db2196a626b3a22a822b0b55748..48e90c055e0269be6136385ac50935e411d4505e 100644 (file)
--- a/altoslib/AltosEepromRecordSet.java
+++ b/altoslib/AltosEepromRecordSet.java
@@ -12,13 +12,13 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.util.*;
 
 public class AltosEepromRecordSet implements AltosRecordSet {
-       AltosEepromNew                  eeprom;
+       AltosEeprom                     eeprom;
        TreeSet<AltosEepromRecord>      ordered;
        AltosCalData                    cal_data;
 
@@ -33,6 +33,7 @@ public class AltosEepromRecordSet implements AltosRecordSet {
                                if (record.cmd() == AltosLib.AO_LOG_FLIGHT) {
                                        cal_data.set_tick(record.tick());
                                        cal_data.set_boost_tick();
+                                       break;
                                }
                        }
                }
@@ -41,13 +42,15 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 
        public void capture_series(AltosDataListener listener) {
                AltosCalData    cal_data = cal_data();
+
+               cal_data.reset();
                for (AltosEepromRecord record : ordered) {
                        record.provide_data(listener, cal_data);
                }
                listener.finish();
        }
 
-       public AltosEepromRecordSet(AltosEepromNew eeprom) {
+       public AltosEepromRecordSet(AltosEeprom eeprom) {
                this.eeprom = eeprom;
 
                AltosConfigData         config_data = eeprom.config_data();
@@ -72,7 +75,8 @@ public class AltosEepromRecordSet implements AltosRecordSet {
                        break;
                case AltosLib.AO_LOG_FORMAT_TELEMINI2:
                case AltosLib.AO_LOG_FORMAT_TELEMINI3:
-               case AltosLib.AO_LOG_FORMAT_EASYMINI:
+               case AltosLib.AO_LOG_FORMAT_EASYMINI1:
+               case AltosLib.AO_LOG_FORMAT_EASYMINI2:
                        record = new AltosEepromRecordMini(eeprom);
                        break;
                case AltosLib.AO_LOG_FORMAT_TELEGPS:
@@ -111,6 +115,6 @@ public class AltosEepromRecordSet implements AltosRecordSet {
        }
 
        public AltosEepromRecordSet(InputStream input) throws IOException {
-               this(new AltosEepromNew(input));
+               this(new AltosEeprom(input));
        }
 }