projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Hide 'state' member and use accessor function
[fw/altos]
/
altoslib
/
AltosEepromDownload.java
diff --git
a/altoslib/AltosEepromDownload.java
b/altoslib/AltosEepromDownload.java
index baaeb9933c05b9a75bb2d6cc073dd05b1cde6ec5..5e035dbc008ddb4c12b23311ca940ef25e69efd3 100644
(file)
--- a/
altoslib/AltosEepromDownload.java
+++ b/
altoslib/AltosEepromDownload.java
@@
-111,12
+111,12
@@
public class AltosEepromDownload implements Runnable {
monitor.set_flight(state.flight);
/* Monitor state transitions to update display */
monitor.set_flight(state.flight);
/* Monitor state transitions to update display */
- if (state.state != AltosLib.ao_flight_invalid &&
- state.state <= AltosLib.ao_flight_landed)
+ if (state.state
()
!= AltosLib.ao_flight_invalid &&
+ state.state
()
<= AltosLib.ao_flight_landed)
{
{
- if (state.state > AltosLib.ao_flight_pad)
+ if (state.state
()
> AltosLib.ao_flight_pad)
want_file = true;
want_file = true;
- if (state.state == AltosLib.ao_flight_landed)
+ if (state.state
()
== AltosLib.ao_flight_landed)
done = true;
}
done = true;
}
@@
-174,13
+174,13
@@
public class AltosEepromDownload implements Runnable {
CaptureEeprom (eechunk, log_format);
CaptureEeprom (eechunk, log_format);
- if (state.state
!= prev_state && state.state
!= AltosLib.ao_flight_invalid) {
+ if (state.state
() != prev_state && state.state()
!= AltosLib.ao_flight_invalid) {
state_block = block;
state_block = block;
- prev_state = state.state;
+ prev_state = state.state
()
;
}
monitor.set_value(state.state_name(),
}
monitor.set_value(state.state_name(),
- state.state,
+ state.state
()
,
block - state_block,
block - log.start_block);
}
block - state_block,
block - log.start_block);
}