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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 8e63f630..f8e60e28 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -64,6 +64,16 @@ public class AltosDroid extends Activity {
 	// Layout Views
 	private TextView mTitle;
 	private TextView mSerialView;
+	private TextView mCallsignView;
+	private TextView mStateView;
+	private TextView mSpeedView;
+	private TextView mAccelView;
+	private TextView mRangeView;
+	private TextView mHeightView;
+	private TextView mElevationView;
+	private TextView mBearingView;
+	private TextView mLatitudeView;
+	private TextView mLongitudeView;
 
 	// Service
 	private boolean mIsBound   = false;
@@ -97,6 +107,8 @@ public class AltosDroid extends Activity {
 					ad.mTitle.setText(R.string.title_connected_to);
 					ad.mTitle.append(str);
 					Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
+					//TEST!
+					ad.mSerialView.setText(Dumper.dump(ad.mConfigData));
 					break;
 				case TelemetryService.STATE_CONNECTING:
 					ad.mTitle.setText(R.string.title_connecting);
@@ -110,10 +122,9 @@ public class AltosDroid extends Activity {
 				}
 				break;
 			case MSG_TELEMETRY:
-				//byte[] buf = (byte[]) msg.obj;
-				// construct a string from the buffer
-				//String telem = new String(buf);
-				//ad.mSerialView.append(telem);
+				ad.update_ui((AltosState) msg.obj);
+				// TEST!
+				ad.mSerialView.setText(Dumper.dump(msg.obj));
 				break;
 			}
 		}
@@ -162,6 +173,33 @@ public class AltosDroid extends Activity {
 		}
 	}
 
+	void update_ui(AltosState state) {
+		mCallsignView.setText(state.data.callsign);
+		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));
+		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));
+		mElevationView.setText(String.format("%3.0f°", state.elevation));
+		if (state.from_pad != null)
+			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"));
+	}
+
+	String pos(double p, String pos, String neg) {
+		String	h = pos;
+		if (p < 0) {
+			h = neg;
+			p = -p;
+		}
+		int deg = (int) Math.floor(p);
+		double min = (p - Math.floor(p)) * 60.0;
+		return String.format("%s %d° %9.6f", h, deg, min);
+	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -170,7 +208,8 @@ public class AltosDroid extends Activity {
 
 		// Set up the window layout
 		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
-		setContentView(R.layout.main);
+		//setContentView(R.layout.main);
+		setContentView(R.layout.altosdroid);
 		getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title);
 
 		// Set up the custom title
@@ -179,11 +218,22 @@ public class AltosDroid extends Activity {
 		mTitle = (TextView) findViewById(R.id.title_right_text);
 
 		// Set up the temporary Text View
-		mSerialView = (TextView) findViewById(R.id.in);
+		mSerialView = (TextView) findViewById(R.id.text);
 		mSerialView.setMovementMethod(new ScrollingMovementMethod());
 		mSerialView.setClickable(false);
 		mSerialView.setLongClickable(false);
 
+		mCallsignView  = (TextView) findViewById(R.id.callsign_value);
+		mStateView     = (TextView) findViewById(R.id.state_value);
+		mSpeedView     = (TextView) findViewById(R.id.speed_value);
+		mAccelView     = (TextView) findViewById(R.id.accel_value);
+		mRangeView     = (TextView) findViewById(R.id.range_value);
+		mHeightView    = (TextView) findViewById(R.id.height_value);
+		mElevationView = (TextView) findViewById(R.id.elevation_value);
+		mBearingView   = (TextView) findViewById(R.id.bearing_value);
+		mLatitudeView  = (TextView) findViewById(R.id.latitude_value);
+		mLongitudeView = (TextView) findViewById(R.id.longitude_value);
+
 		// Get local Bluetooth adapter
 		mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
 
@@ -202,10 +252,6 @@ public class AltosDroid extends Activity {
 			}
 		});
 
-		// Start Telemetry Service
-		startService(new Intent(AltosDroid.this, TelemetryService.class));
-
-		doBindService();
 	}
 
 	@Override
@@ -217,13 +263,17 @@ public class AltosDroid extends Activity {
 			Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
 			startActivityForResult(enableIntent, REQUEST_ENABLE_BT);
 		}
+
+		// Start Telemetry Service
+		startService(new Intent(AltosDroid.this, TelemetryService.class));
+
+		doBindService();
 	}
 
 	@Override
 	public synchronized void onResume() {
 		super.onResume();
 		if(D) Log.e(TAG, "+ ON RESUME +");
-
 	}
 
 	@Override
@@ -236,17 +286,16 @@ public class AltosDroid extends Activity {
 	public void onStop() {
 		super.onStop();
 		if(D) Log.e(TAG, "-- ON STOP --");
+
+		doUnbindService();
 	}
 
 	@Override
 	public void onDestroy() {
 		super.onDestroy();
-
-		doUnbindService();
+		if(D) Log.e(TAG, "--- ON DESTROY ---");
 
 		if (tts != null) tts.shutdown();
-
-		if(D) Log.e(TAG, "--- ON DESTROY ---");
 	}