X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=20904d2b0845f6de6723144bfb6bf2dca3ac23b9;hp=df2263ce93f79d0b5e72afae84d72a9acacc4272;hb=a8ecf3aa4e88d4c76643fb541fb1d5535a454aba;hpb=5c7370dcd7a65c81a3c903a71167e07cfcbade53

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index df2263ce..20904d2b 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -32,8 +32,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
-import android.speech.tts.TextToSpeech;
-import android.speech.tts.TextToSpeech.OnInitListener;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.view.Menu;
@@ -55,10 +53,7 @@ public class AltosDroid extends Activity {
 
 	// Message types received by our Handler
 	public static final int MSG_STATE_CHANGE    = 1;
-	public static final int MSG_DEVNAME         = 2;
-	public static final int MSG_TOAST           = 3;
-	public static final int MSG_DEVCONFIG       = 4;
-	public static final int MSG_TELEMETRY       = 5;
+	public static final int MSG_TELEMETRY       = 2;
 
 	// Intent request codes
 	private static final int REQUEST_CONNECT_DEVICE = 1;
@@ -66,7 +61,24 @@ public class AltosDroid extends Activity {
 
 	// Layout Views
 	private TextView mTitle;
+
+	// Flight state values
+	private TextView mCallsignView;
+	private TextView mRSSIView;
 	private TextView mSerialView;
+	private TextView mFlightView;
+	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;
+
+	// Generic field for extras at the bottom
+	private TextView mTextView;
 
 	// Service
 	private boolean mIsBound   = false;
@@ -79,8 +91,7 @@ public class AltosDroid extends Activity {
 	private BluetoothAdapter mBluetoothAdapter = null;
 
 	// Text to Speech
-	private TextToSpeech tts    = null;
-	private boolean tts_enabled = false;
+	private AltosVoice mAltosVoice = null;
 
 	// The Handler that gets information back from the Telemetry Service
 	static class IncomingHandler extends Handler {
@@ -100,6 +111,9 @@ 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();
+					ad.mAltosVoice.speak("Connected");
+					//TEST!
+					ad.mTextView.setText(Dumper.dump(ad.mConfigData));
 					break;
 				case TelemetryService.STATE_CONNECTING:
 					ad.mTitle.setText(R.string.title_connecting);
@@ -108,29 +122,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_DEVCONFIG:
 			case MSG_TELEMETRY:
-				//byte[] buf = (byte[]) msg.obj;
-				// construct a string from the buffer
-				//String telem = new String(buf);
-				//ad.mSerialView.append(telem);
-				break;
-			case MSG_DEVNAME:
-				// save the connected device's name
-				ad.mConnectedDeviceName = (String) msg.obj;
-				if (ad.mConnectedDeviceName != null)
-					Toast.makeText(ad.getApplicationContext(), "Connected to "
-							+ ad.mConnectedDeviceName, Toast.LENGTH_SHORT).show();
-				break;
-			case MSG_TOAST:
-				Toast.makeText(
-						ad.getApplicationContext(),
-						(String) msg.obj,
-						Toast.LENGTH_SHORT).show();
+				ad.update_ui((AltosState) msg.obj);
+				// TEST!
+				ad.mTextView.setText(Dumper.dump(msg.obj));
 				break;
 			}
 		}
@@ -156,27 +155,67 @@ public class AltosDroid extends Activity {
 	};
 
 
+	void doBindService() {
+		bindService(new Intent(this, TelemetryService.class), mConnection, Context.BIND_AUTO_CREATE);
+		mIsBound = true;
+	}
+
+	void doUnbindService() {
+		if (mIsBound) {
+			// If we have received the service, and hence registered with it, then now is the time to unregister.
+			if (mService != null) {
+				try {
+					Message msg = Message.obtain(null, TelemetryService.MSG_UNREGISTER_CLIENT);
+					msg.replyTo = mMessenger;
+					mService.send(msg);
+				} catch (RemoteException e) {
+					// There is nothing special we need to do if the service has crashed.
+				}
+			}
+			// Detach our existing connection.
+			unbindService(mConnection);
+			mIsBound = false;
+		}
+	}
+
+	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)
+			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"));
+
+		mAltosVoice.tell(state);
+	}
+
+	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("%d° %9.6f\" %s", deg, min, h);
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		if(D) Log.e(TAG, "+++ ON CREATE +++");
 
-		// Set up the window layout
-		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
-		setContentView(R.layout.main);
-		getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title);
-
-		// Set up the custom title
-		mTitle = (TextView) findViewById(R.id.title_left_text);
-		mTitle.setText(R.string.app_name);
-		mTitle = (TextView) findViewById(R.id.title_right_text);
-
-		// Set up the temporary Text View
-		mSerialView = (TextView) findViewById(R.id.in);
-		mSerialView.setMovementMethod(new ScrollingMovementMethod());
-		mSerialView.setClickable(false);
-		mSerialView.setLongClickable(false);
-
 		// Get local Bluetooth adapter
 		mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
 
@@ -187,18 +226,38 @@ public class AltosDroid extends Activity {
 			return;
 		}
 
-		// Enable Text to Speech
-		tts = new TextToSpeech(this, new OnInitListener() {
-			public void onInit(int status) {
-				if (status == TextToSpeech.SUCCESS) tts_enabled = true;
-				if (tts_enabled) tts.speak("AltosDroid ready", TextToSpeech.QUEUE_ADD, null );
-			}
-		});
+		// Set up the window layout
+		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
+		//setContentView(R.layout.main);
+		setContentView(R.layout.altosdroid);
+		getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title);
 
-		// Start Telemetry Service
-		startService(new Intent(AltosDroid.this, TelemetryService.class));
+		// Set up the custom title
+		mTitle = (TextView) findViewById(R.id.title_left_text);
+		mTitle.setText(R.string.app_name);
+		mTitle = (TextView) findViewById(R.id.title_right_text);
 
-		doBindService();
+		// Set up the temporary Text View
+		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);
+		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);
+
+		mAltosVoice = new AltosVoice(this);
 	}
 
 	@Override
@@ -210,13 +269,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
@@ -229,17 +292,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 (tts != null) tts.shutdown();
-
 		if(D) Log.e(TAG, "--- ON DESTROY ---");
+
+		mAltosVoice.stop();
 	}
 
 
@@ -303,28 +365,4 @@ public class AltosDroid extends Activity {
 		return false;
 	}
 
-
-	void doBindService() {
-		bindService(new Intent(this, TelemetryService.class), mConnection, Context.BIND_AUTO_CREATE);
-		mIsBound = true;
-	}
-
-	void doUnbindService() {
-		if (mIsBound) {
-			// If we have received the service, and hence registered with it, then now is the time to unregister.
-			if (mService != null) {
-				try {
-					Message msg = Message.obtain(null, TelemetryService.MSG_UNREGISTER_CLIENT);
-					msg.replyTo = mMessenger;
-					mService.send(msg);
-				} catch (RemoteException e) {
-					// There is nothing special we need to do if the service has crashed.
-				}
-			}
-			// Detach our existing connection.
-			unbindService(mConnection);
-			mIsBound = false;
-		}
-	}
-
 }