X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromRecordSet.java;h=2a7d97e3002dc93b662452ed255f912f0f3043cf;hb=7230dbad9326d55427e23924e45cf8270411ff7b;hp=fcf224f35c2a948a3dda802ee5dafc135ff13848;hpb=06cf43cea9149f8c04c80785a613408454eab4f2;p=fw%2Faltos

diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java
index fcf224f3..2a7d97e3 100644
--- a/altoslib/AltosEepromRecordSet.java
+++ b/altoslib/AltosEepromRecordSet.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.util.*;
@@ -27,24 +27,32 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 		return eeprom.config_data();
 	}
 
+	private void init_cal_data() {
+		for (AltosEepromRecord record : ordered) {
+			if (record.cmd() == AltosLib.AO_LOG_FLIGHT) {
+				cal_data.set_tick(record.tick());
+				cal_data.set_boost_tick();
+				cal_data.set_state(AltosLib.ao_flight_pad);
+				break;
+			}
+		}
+	}
+
 	public AltosCalData cal_data() {
 		if (cal_data == null) {
 			cal_data = new AltosCalData(config_data());
-			for (AltosEepromRecord record : ordered) {
-				if (record.cmd() == AltosLib.AO_LOG_FLIGHT) {
-					cal_data.set_tick(record.tick());
-					cal_data.set_boost_tick();
-					break;
-				}
-			}
+			init_cal_data();
 		}
 		return cal_data;
 	}
 
 	public void capture_series(AltosDataListener listener) {
-		AltosCalData	cal_data = cal_data();
-
-		cal_data.reset();
+		if (cal_data == null) {
+			cal_data();
+		} else {
+			cal_data.reset();
+			init_cal_data();
+		}
 		listener.set_log_format(config_data().log_format);
 
 		for (AltosEepromRecord record : ordered) {
@@ -98,6 +106,9 @@ public class AltosEepromRecordSet implements AltosRecordSet {
 		case AltosLib.AO_LOG_FORMAT_MICROPEAK2:
 			record = new AltosEepromRecordMicroPeak2(eeprom);
 			break;
+		case AltosLib.AO_LOG_FORMAT_EASYMOTOR:
+			record = new AltosEepromRecordMotor(eeprom);
+			break;
 		}
 
 		ordered = new TreeSet<AltosEepromRecord>();