From 8cb09f8a3e2dae5f7f3d2d3dbbc81ba40b491e75 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 21 Oct 2012 20:57:21 -0700 Subject: altosdroid: AltosState now has speed and max_speed funcs These pull out the appropriate baro/accel speed values and may use some fancier values in future. Signed-off-by: Keith Packard --- altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to '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 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)); -- cgit v1.2.3