Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

Conflicts:
	ao-bringup/turnon_telemega

1 files changed, 4 insertions, 4 deletions

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
index 16427d8b..b257b936 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
@@ -78,7 +78,7 @@ public class TabLanded extends AltosDroidTab {
 	public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (from_receiver != null) {
 			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
-			mDistanceView.setText(String.format("%6.0f m", from_receiver.distance));
+			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
 		}
 		if (state != null && state.gps != null) {
 			mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
@@ -91,9 +91,9 @@ public class TabLanded extends AltosDroidTab {
 		}
 
 		if (state != null) {
-			mMaxHeightView.setText(String.format("%6.0f m", state.max_height()));
-			mMaxAccelView.setText(String.format("%6.0f m/s²", state.max_acceleration()));
-			mMaxSpeedView.setText(String.format("%6.0f m/s", state.max_speed()));
+			set_value(mMaxHeightView, AltosConvert.height, 6, state.max_height());
+			set_value(mMaxAccelView, AltosConvert.accel, 6, state.max_acceleration());
+			set_value(mMaxSpeedView, AltosConvert.speed, 6, state.max_speed());
 		}
 	}
 }