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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 00689684..ab1fb0de 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -81,12 +81,16 @@ public class AltosDroid extends Activity {
 
 	// Generic field for extras at the bottom
 	private TextView mTextView;
+	private TextView mVersion;
 
 	// Service
 	private boolean mIsBound   = false;
 	private Messenger mService = null;
 	final Messenger mMessenger = new Messenger(new IncomingHandler(this));
 
+	// Preferences
+	private AltosDroidPreferences prefs = null;
+
 	// TeleBT Config data
 	private AltosConfigData mConfigData = null;
 	// Local Bluetooth adapter
@@ -186,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));
@@ -228,6 +229,10 @@ public class AltosDroid extends Activity {
 			return;
 		}
 
+		// Initialise preferences
+		prefs = new AltosDroidPreferences(this);
+		AltosPreferences.init(prefs);
+
 		// Set up the window layout
 		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
 		//setContentView(R.layout.main);
@@ -245,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);