altosdroid: move units into code, to match altosui

[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 ba424e7915182881399516d7ec27d1759790db67..9ecce681ac98b2bba4517648750ec6df9e8e2169 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -179,13 +179,13 @@ public class AltosDroid extends Activity {
                double speed = state.speed;
                if (!state.ascent)
                        speed = state.baro_speed;
-               mSpeedView.setText(String.format("%6.0f", speed));
-               mAccelView.setText(String.format("%6.0f", state.acceleration));
-               mRangeView.setText(String.format("%6.0f", state.range));
-               mAltitudeView.setText(String.format("%6.0f", state.height));
-               mAzimuthView.setText(String.format("%3.0f", state.elevation));
+               mSpeedView.setText(String.format("%6.0f m/s", speed));
+               mAccelView.setText(String.format("%6.0f m/s²", state.acceleration));
+               mRangeView.setText(String.format("%6.0f m", state.range));
+               mAltitudeView.setText(String.format("%6.0f m", state.height));
+               mAzimuthView.setText(String.format("%3.0f°", state.elevation));
                if (state.from_pad != null)
-                       mBearingView.setText(String.format("%3.0f", state.from_pad.bearing));
+                       mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
                mLatitudeView.setText(pos(state.gps.lat, "N", "S"));
                mLongitudeView.setText(pos(state.gps.lon, "W", "E"));
        }