X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=ab1fb0dee09f837cf56df1b4ddb00efc8c550337;hb=282f0451dd141db3304ab73e4020a849e59721eb;hp=3396f77e40f9df866d94bd5ef87e355cfa1a3299;hpb=fe8ab96e8727c25c04cac473cafb264cf7e80156;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 3396f77e..ab1fb0de 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -81,6 +81,7 @@ public class AltosDroid extends Activity {
 
 	// Generic field for extras at the bottom
 	private TextView mTextView;
+	private TextView mVersion;
 
 	// Service
 	private boolean mIsBound   = false;
@@ -189,10 +190,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));
@@ -252,6 +250,11 @@ public class AltosDroid extends Activity {
 		mTextView.setClickable(false);
 		mTextView.setLongClickable(false);
 
+		mVersion = (TextView) findViewById(R.id.version);
+		mVersion.setText("Version: " + BuildInfo.version +
+		                 "  Built: " + BuildInfo.builddate + " " + BuildInfo.buildtime + " " + BuildInfo.buildtz +
+		                 "  (" + BuildInfo.branch + "-" + BuildInfo.commitnum + "-" + BuildInfo.commithash + ")");
+
 		mCallsignView  = (TextView) findViewById(R.id.callsign_value);
 		mRSSIView      = (TextView) findViewById(R.id.rssi_value);
 		mSerialView    = (TextView) findViewById(R.id.serial_value);