diff options
| author | Mike Beattie <mike@ethernal.org> | 2013-09-03 15:10:23 +1200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-09-05 11:42:22 -0700 |
| commit | ee14ad16c242e8bd7a9d33ebf569211d1490b8e1 (patch) | |
| tree | 4bba37bb571389888a741eb62e688464ce9f7fe9 /altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java | |
| parent | 5b976a6651f4eb05d30afc08b9e1f27c7e52ae00 (diff) | |
altosdroid: update to support new state code
Signed-off-by: Mike Beattie <mike@ethernal.org>
Conflicts:
altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java')
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java index f9d30b34..2c6732e5 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java @@ -103,26 +103,26 @@ public class TabPad extends Fragment implements AltosDroidTab { public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) { if (state != null) { - mBatteryVoltageView.setText(AltosDroid.number("%4.2f V", state.battery)); - mBatteryLights.set(state.battery > 3.7, state.battery == AltosLib.MISSING); + mBatteryVoltageView.setText(AltosDroid.number("%4.2f V", state.battery_voltage)); + mBatteryLights.set(state.battery_voltage > 3.7, state.battery_voltage == AltosLib.MISSING); - mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.drogue_sense)); - mApogeeLights.set(state.drogue_sense > 3.2, state.drogue_sense == AltosLib.MISSING); + mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage)); + mApogeeLights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING); - mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_sense)); - mMainLights.set(state.main_sense > 3.2, state.main_sense == AltosLib.MISSING); + mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_voltage)); + mMainLights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING); - if (state.data.flight != 0) { - if (state.data.state <= AltosLib.ao_flight_pad) + if (state.flight != 0) { + if (state.state <= AltosLib.ao_flight_pad) mDataLoggingView.setText("Ready to record"); - else if (state.data.state < AltosLib.ao_flight_landed) + else if (state.state < AltosLib.ao_flight_landed) mDataLoggingView.setText("Recording data"); else mDataLoggingView.setText("Recorded data"); } else { mDataLoggingView.setText("Storage full"); } - mDataLoggingLights.set(state.data.flight != 0, state.data.flight == AltosLib.MISSING); + mDataLoggingLights.set(state.flight != 0, state.flight == AltosLib.MISSING); if (state.gps != null) { mGPSLockedView.setText(AltosDroid.integer("%4d sats", state.gps.nsat)); |