X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromFile.java;h=d88aeab9e77a33fd6e567b69a913cc527efd0c9a;hp=b7e446ce6a1627fbdd8b6d4637176bfe1f4351a6;hb=7041c386cdf37716f8daf0bc1a9204db620e3de9;hpb=ff13cf1359e1f4ae33b16a5867fd364993566b65

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index b7e446ce..d88aeab9 100644
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_9;
 
 import java.io.*;
 import java.util.*;
@@ -72,7 +72,7 @@ public class AltosEepromFile extends AltosStateIterable {
 		headers = new AltosEepromIterable(AltosEepromHeader.read(input));
 
 		start = headers.state();
-		if (start.state != AltosLib.ao_flight_stateless)
+		if (start.state() != AltosLib.ao_flight_stateless)
 			start.set_state(AltosLib.ao_flight_pad);
 
 		if (start.log_format == AltosLib.MISSING) {
@@ -94,7 +94,8 @@ public class AltosEepromFile extends AltosStateIterable {
 		case AltosLib.AO_LOG_FORMAT_TELEMETRY:
 		case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
-			body = new AltosEepromIterable(AltosEepromMega.read(input));
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
+			body = new AltosEepromIterable(AltosEepromMega.read(input, start.log_format));
 			break;
 		case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
 			body = new AltosEepromIterable(AltosEepromMetrum2.read(input));
@@ -116,7 +117,7 @@ public class AltosEepromFile extends AltosStateIterable {
 		for (AltosEeprom eeprom : body) {
 			eeprom.update_state(state);
 			state.finish_update();
-			if (state.state >= AltosLib.ao_flight_boost) {
+			if (state.state() >= AltosLib.ao_flight_boost) {
 				start.set_boost_tick(state.tick);
 				break;
 			}