projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libaltos: Fix for Mac OS X El Capitan
[fw/altos]
/
altoslib
/
AltosEepromFile.java
diff --git
a/altoslib/AltosEepromFile.java
b/altoslib/AltosEepromFile.java
index ac537856191c579904aa72caa2609e86d51951f6..000bb1be4d33c7530c03bdcf9a652af348be6622 100644
(file)
--- a/
altoslib/AltosEepromFile.java
+++ b/
altoslib/AltosEepromFile.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
7
;
+package org.altusmetrum.altoslib_
10
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-72,7
+72,7
@@
public class AltosEepromFile extends AltosStateIterable {
headers = new AltosEepromIterable(AltosEepromHeader.read(input));
start = headers.state();
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) {
start.set_state(AltosLib.ao_flight_pad);
if (start.log_format == AltosLib.MISSING) {
@@
-89,7
+89,7
@@
public class AltosEepromFile extends AltosStateIterable {
body = new AltosEepromIterable(AltosEepromTM.read(input));
break;
case AltosLib.AO_LOG_FORMAT_TINY:
body = new AltosEepromIterable(AltosEepromTM.read(input));
break;
case AltosLib.AO_LOG_FORMAT_TINY:
- body = new AltosEepromIterable(AltosEepromT
m
.read(input));
+ body = new AltosEepromIterable(AltosEepromT
Mini
.read(input));
break;
case AltosLib.AO_LOG_FORMAT_TELEMETRY:
case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
break;
case AltosLib.AO_LOG_FORMAT_TELEMETRY:
case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
@@
-117,7
+117,7
@@
public class AltosEepromFile extends AltosStateIterable {
for (AltosEeprom eeprom : body) {
eeprom.update_state(state);
state.finish_update();
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;
}
start.set_boost_tick(state.tick);
break;
}