*
* 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
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
import java.io.*;
import java.util.*;
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) {
body = new AltosEepromIterable(AltosEepromTM.read(input));
break;
case AltosLib.AO_LOG_FORMAT_TINY:
- body = new AltosEepromIterable(AltosEepromTm.read(input));
+ body = new AltosEepromIterable(AltosEepromTMini.read(input));
break;
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));
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:
body = new AltosEepromIterable(AltosEepromMini.read(input));
break;
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;
}