altoslib: Handle EasyMini v2.0 ADC values

[fw/altos] / altoslib / AltosEepromRecordSet.java

diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java
index 0c60c1a5ab5b8db2196a626b3a22a822b0b55748..1f10e677ee29540d9731c55749d73778eaf26d8d 100644 (file)
--- a/altoslib/AltosEepromRecordSet.java
+++ b/altoslib/AltosEepromRecordSet.java
@@ -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,6 +42,8 @@ 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);
                }
@@ -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: