X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=bc129feed576a4e0b758e5f4641918dcba567c72;hb=2e6af70c87e7cc62a92b09bbbde745a31d83b5eb;hp=f8e60e280fbfb7287cf8064d6760d45b85c57602;hpb=c32325af6605e78c1d1147d466f3ea12ce94124a;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index f8e60e28..bc129fee 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -63,8 +63,12 @@ public class AltosDroid extends Activity {
 
 	// Layout Views
 	private TextView mTitle;
-	private TextView mSerialView;
+
+	// Flight state values
 	private TextView mCallsignView;
+	private TextView mRSSIView;
+	private TextView mSerialView;
+	private TextView mFlightView;
 	private TextView mStateView;
 	private TextView mSpeedView;
 	private TextView mAccelView;
@@ -75,6 +79,9 @@ public class AltosDroid extends Activity {
 	private TextView mLatitudeView;
 	private TextView mLongitudeView;
 
+	// Generic field for extras at the bottom
+	private TextView mTextView;
+
 	// Service
 	private boolean mIsBound   = false;
 	private Messenger mService = null;
@@ -108,7 +115,7 @@ public class AltosDroid extends Activity {
 					ad.mTitle.append(str);
 					Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
 					//TEST!
-					ad.mSerialView.setText(Dumper.dump(ad.mConfigData));
+					ad.mTextView.setText(Dumper.dump(ad.mConfigData));
 					break;
 				case TelemetryService.STATE_CONNECTING:
 					ad.mTitle.setText(R.string.title_connecting);
@@ -117,14 +124,14 @@ public class AltosDroid extends Activity {
 				case TelemetryService.STATE_NONE:
 					ad.mConfigData = null;
 					ad.mTitle.setText(R.string.title_not_connected);
-					ad.mSerialView.setText("");
+					ad.mTextView.setText("");
 					break;
 				}
 				break;
 			case MSG_TELEMETRY:
 				ad.update_ui((AltosState) msg.obj);
 				// TEST!
-				ad.mSerialView.setText(Dumper.dump(msg.obj));
+				ad.mTextView.setText(Dumper.dump(msg.obj));
 				break;
 			}
 		}
@@ -175,6 +182,9 @@ public class AltosDroid extends Activity {
 
 	void update_ui(AltosState state) {
 		mCallsignView.setText(state.data.callsign);
+		mRSSIView.setText(String.format("%d", state.data.rssi));
+		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)
@@ -198,7 +208,7 @@ public class AltosDroid extends Activity {
 		}
 		int deg = (int) Math.floor(p);
 		double min = (p - Math.floor(p)) * 60.0;
-		return String.format("%s %d° %9.6f", h, deg, min);
+		return String.format("%d° %9.6f\" %s", deg, min, h);
 	}
 
 	@Override
@@ -206,6 +216,16 @@ public class AltosDroid extends Activity {
 		super.onCreate(savedInstanceState);
 		if(D) Log.e(TAG, "+++ ON CREATE +++");
 
+		// Get local Bluetooth adapter
+		mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+
+		// If the adapter is null, then Bluetooth is not supported
+		if (mBluetoothAdapter == null) {
+			Toast.makeText(this, "Bluetooth is not available", Toast.LENGTH_LONG).show();
+			finish();
+			return;
+		}
+
 		// Set up the window layout
 		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
 		//setContentView(R.layout.main);
@@ -218,12 +238,15 @@ public class AltosDroid extends Activity {
 		mTitle = (TextView) findViewById(R.id.title_right_text);
 
 		// Set up the temporary Text View
-		mSerialView = (TextView) findViewById(R.id.text);
-		mSerialView.setMovementMethod(new ScrollingMovementMethod());
-		mSerialView.setClickable(false);
-		mSerialView.setLongClickable(false);
+		mTextView = (TextView) findViewById(R.id.text);
+		mTextView.setMovementMethod(new ScrollingMovementMethod());
+		mTextView.setClickable(false);
+		mTextView.setLongClickable(false);
 
 		mCallsignView  = (TextView) findViewById(R.id.callsign_value);
+		mRSSIView      = (TextView) findViewById(R.id.rssi_value);
+		mSerialView    = (TextView) findViewById(R.id.serial_value);
+		mFlightView    = (TextView) findViewById(R.id.flight_value);
 		mStateView     = (TextView) findViewById(R.id.state_value);
 		mSpeedView     = (TextView) findViewById(R.id.speed_value);
 		mAccelView     = (TextView) findViewById(R.id.accel_value);
@@ -234,16 +257,6 @@ public class AltosDroid extends Activity {
 		mLatitudeView  = (TextView) findViewById(R.id.latitude_value);
 		mLongitudeView = (TextView) findViewById(R.id.longitude_value);
 
-		// Get local Bluetooth adapter
-		mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-
-		// If the adapter is null, then Bluetooth is not supported
-		if (mBluetoothAdapter == null) {
-			Toast.makeText(this, "Bluetooth is not available", Toast.LENGTH_LONG).show();
-			finish();
-			return;
-		}
-
 		// Enable Text to Speech
 		tts = new TextToSpeech(this, new OnInitListener() {
 			public void onInit(int status) {