projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: cal_data is no longer public from AltosState
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
AltosDroid.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index f648142f9eff0de1fdde95fa2d94963655e1f054..924ab4c9350a4564bdcb532b04e47777ead16bef 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@
-70,9
+70,9
@@
class SavedState {
locked = state.gps.locked;
else
locked = false;
locked = state.gps.locked;
else
locked = false;
- callsign = state.cal_data.callsign;
- serial = state.cal_data.serial;
- flight = state.cal_data.flight;
+ callsign = state.cal_data
()
.callsign;
+ serial = state.cal_data
()
.serial;
+ flight = state.cal_data
()
.flight;
rssi = state.rssi;
}
}
rssi = state.rssi;
}
}
@@
-484,20
+484,20
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
state.gps.alt);
}
state.gps.alt);
}
- if (saved_state == null || !same_string(saved_state.callsign, state.cal_data.callsign)) {
- mCallsignView.setText(state.cal_data.callsign);
+ if (saved_state == null || !same_string(saved_state.callsign, state.cal_data
()
.callsign)) {
+ mCallsignView.setText(state.cal_data
()
.callsign);
}
}
- if (saved_state == null || state.cal_data.serial != saved_state.serial) {
- if (state.cal_data.serial == AltosLib.MISSING)
+ if (saved_state == null || state.cal_data
()
.serial != saved_state.serial) {
+ if (state.cal_data
()
.serial == AltosLib.MISSING)
mSerialView.setText("");
else
mSerialView.setText("");
else
- mSerialView.setText(String.format("%d", state.cal_data.serial));
+ mSerialView.setText(String.format("%d", state.cal_data
()
.serial));
}
}
- if (saved_state == null || state.cal_data.flight != saved_state.flight) {
- if (state.cal_data.flight == AltosLib.MISSING)
+ if (saved_state == null || state.cal_data
()
.flight != saved_state.flight) {
+ if (state.cal_data
()
.flight == AltosLib.MISSING)
mFlightView.setText("");
else
mFlightView.setText("");
else
- mFlightView.setText(String.format("%d", state.cal_data.flight));
+ mFlightView.setText(String.format("%d", state.cal_data
()
.flight));
}
if (saved_state == null || state.state() != saved_state.state) {
if (state.state() == AltosLib.ao_flight_stateless) {
}
if (saved_state == null || state.state() != saved_state.state) {
if (state.state() == AltosLib.ao_flight_stateless) {