Merge remote-tracking branch 'mjb/master'

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosDroid.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index b44b8ce9d28c6e1a03ff4e58eb46c9f62dd3d3c7..20904d2b0845f6de6723144bfb6bf2dca3ac23b9 100644 (file)
--- 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;
@@ -63,8 +61,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 +77,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;
@@ -86,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 {
@@ -107,8 +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.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 +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_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 +180,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)
@@ -188,6 +196,8 @@ public class AltosDroid extends Activity {
                        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) {
@@ -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,24 +257,7 @@ 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) {
-                               if (status == TextToSpeech.SUCCESS) tts_enabled = true;
-                               if (tts_enabled) tts.speak("AltosDroid ready", TextToSpeech.QUEUE_ADD, null );
-                       }
-               });
-
+               mAltosVoice = new AltosVoice(this);
        }
 
        @Override
@@ -295,7 +301,7 @@ public class AltosDroid extends Activity {
                super.onDestroy();
                if(D) Log.e(TAG, "--- ON DESTROY ---");
 
-               if (tts != null) tts.shutdown();
+               mAltosVoice.stop();
        }