diff options
| author | Bdale Garbee <bdale@gag.com> | 2012-10-23 09:38:36 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2012-10-23 09:38:36 -0600 |
| commit | 055f3232decc07e064d596469b81cf9869411c2d (patch) | |
| tree | cc5ebf8283ca00cbe1344f6ed808feaf7e9575ad /altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | |
| parent | 8ca58e20208495ce63b8256a8ffa43932867e8d5 (diff) | |
| parent | 9e60fa214ad2c48fbe8f7e5c437681aa35d249fa (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java')
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 3396f77e..b1fc8d30 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -189,10 +189,7 @@ public class AltosDroid extends Activity { mSerialView.setText(String.format("%d", state.data.serial)); mFlightView.setText(String.format("%d", state.data.flight)); mStateView.setText(state.data.state()); - double speed = state.speed; - if (!state.ascent) - speed = state.baro_speed; - mSpeedView.setText(String.format("%6.0f m/s", speed)); + mSpeedView.setText(String.format("%6.0f m/s", state.speed())); mAccelView.setText(String.format("%6.0f m/s²", state.acceleration)); mRangeView.setText(String.format("%6.0f m", state.range)); mHeightView.setText(String.format("%6.0f m", state.height)); |