diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:09:09 -0700 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:09:09 -0700 | 
| commit | 4ecc53175a5c28cbc1b846c24d83b6adc3afc2ef (patch) | |
| tree | 4c318f3d5b7ef01247531a8ccb8ce3ce211e48b3 /altoslib/AltosEepromFile.java | |
| parent | 19d25c9f4c80d2c8562fc4abd766a23961167e79 (diff) | |
| parent | a2ea621eac3263348aff50885c79296f8ece26ed (diff) | |
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'altoslib/AltosEepromFile.java')
| -rw-r--r-- | altoslib/AltosEepromFile.java | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java index 33d4f63b..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_8; +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) { @@ -117,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;  			}  | 
