altosdroid: Implement voice just like altosui
authorMike Beattie <mike@ethernal.org>
Thu, 30 Aug 2012 09:08:41 +0000 (21:08 +1200)
committerMike Beattie <mike@ethernal.org>
Thu, 30 Aug 2012 09:08:41 +0000 (21:08 +1200)
Signed-off-by: Mike Beattie <mike@ethernal.org>
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java [new file with mode: 0644]

index bc129feed576a4e0b758e5f4641918dcba567c72..20904d2b0845f6de6723144bfb6bf2dca3ac23b9 100644 (file)
@@ -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;
@@ -93,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 {
@@ -114,6 +111,7 @@ 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;
@@ -198,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) {
@@ -257,14 +257,7 @@ public class AltosDroid extends Activity {
                mLatitudeView  = (TextView) findViewById(R.id.latitude_value);
                mLongitudeView = (TextView) findViewById(R.id.longitude_value);
 
-               // 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
@@ -308,7 +301,7 @@ public class AltosDroid extends Activity {
                super.onDestroy();
                if(D) Log.e(TAG, "--- ON DESTROY ---");
 
-               if (tts != null) tts.shutdown();
+               mAltosVoice.stop();
        }
 
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
new file mode 100644 (file)
index 0000000..3f7c597
--- /dev/null
@@ -0,0 +1,203 @@
+/*\r
+ * Copyright © 2011 Keith Packard <keithp@keithp.com>\r
+ * Copyright © 2012 Mike Beattie <mike@ethernal.org>\r
+ *\r
+ * This program is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; version 2 of the License.\r
+ *\r
+ * This program is distributed in the hope that it will be useful, but\r
+ * WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+ * General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License along\r
+ * with this program; if not, write to the Free Software Foundation, Inc.,\r
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.\r
+ */\r
+\r
+package org.altusmetrum.AltosDroid;\r
+\r
+import android.speech.tts.TextToSpeech;\r
+import android.speech.tts.TextToSpeech.OnInitListener;\r
+\r
+import org.altusmetrum.AltosLib.*;\r
+\r
+public class AltosVoice {\r
+\r
+       private TextToSpeech tts         = null;\r
+       private boolean      tts_enabled = false;\r
+\r
+       private IdleThread   idle_thread = null;\r
+\r
+       private AltosState   old_state   = null;\r
+\r
+       public AltosVoice(AltosDroid a) {\r
+\r
+               tts = new TextToSpeech(a, new OnInitListener() {\r
+                       public void onInit(int status) {\r
+                               if (status == TextToSpeech.SUCCESS) tts_enabled = true;\r
+                               if (tts_enabled) {\r
+                                       speak("AltosDroid ready");\r
+                                       idle_thread = new IdleThread();\r
+                               }\r
+                       }\r
+               });\r
+\r
+       }\r
+\r
+       public void speak(String s) {\r
+               if (!tts_enabled) return;\r
+               tts.speak(s, TextToSpeech.QUEUE_ADD, null);\r
+       }\r
+\r
+       public void stop() {\r
+               if (tts != null) tts.shutdown();\r
+               if (idle_thread != null) {\r
+                       idle_thread.interrupt();\r
+                       idle_thread = null;\r
+               }\r
+       }\r
+\r
+       public void tell(AltosState state) {\r
+               if (!tts_enabled) return;\r
+\r
+               boolean spoke = false;\r
+               if (old_state == null || old_state.state != state.state) {\r
+                       speak(state.data.state());\r
+                       if ((old_state == null || old_state.state <= AltosLib.ao_flight_boost) &&\r
+                           state.state > AltosLib.ao_flight_boost) {\r
+                               speak(String.format("max speed: %d meters per second.", (int) (state.max_speed + 0.5)));\r
+                               spoke = true;\r
+                       } else if ((old_state == null || old_state.state < AltosLib.ao_flight_drogue) &&\r
+                                  state.state >= AltosLib.ao_flight_drogue) {\r
+                               speak(String.format("max height: %d meters.", (int) (state.max_height + 0.5)));\r
+                               spoke = true;\r
+                       }\r
+               }\r
+               if (old_state == null || old_state.gps_ready != state.gps_ready) {\r
+                       if (state.gps_ready) {\r
+                               speak("GPS ready");\r
+                               spoke = true;\r
+                       } else if (old_state != null) {\r
+                               speak("GPS lost");\r
+                               spoke = true;\r
+                       }\r
+               }\r
+               old_state = state;\r
+               idle_thread.notice(state, spoke);\r
+       }\r
+\r
+\r
+       class IdleThread extends Thread {\r
+               boolean            started;\r
+               private AltosState state;\r
+               int                reported_landing;\r
+               int                report_interval;\r
+               long               report_time;\r
+\r
+               public synchronized void report(boolean last) {\r
+                       if (state == null)\r
+                               return;\r
+\r
+                       /* reset the landing count once we hear about a new flight */\r
+                       if (state.state < AltosLib.ao_flight_drogue)\r
+                               reported_landing = 0;\r
+\r
+                       /* Shut up once the rocket is on the ground */\r
+                       if (reported_landing > 2) {\r
+                               return;\r
+                       }\r
+\r
+                       /* If the rocket isn't on the pad, then report height */\r
+                       if (AltosLib.ao_flight_drogue <= state.state &&\r
+                           state.state < AltosLib.ao_flight_landed &&\r
+                           state.range >= 0)\r
+                       {\r
+                               speak(String.format("Height %d, bearing %s %d, elevation %d, range %d.\n",\r
+                                                   (int) (state.height + 0.5),\r
+                                       state.from_pad.bearing_words(\r
+                                             AltosGreatCircle.BEARING_VOICE),\r
+                                                   (int) (state.from_pad.bearing + 0.5),\r
+                                                   (int) (state.elevation + 0.5),\r
+                                                   (int) (state.range + 0.5)));\r
+                       } else if (state.state > AltosLib.ao_flight_pad) {\r
+                               speak(String.format("%d meters", (int) (state.height + 0.5)));\r
+                       } else {\r
+                               reported_landing = 0;\r
+                       }\r
+\r
+                       /* If the rocket is coming down, check to see if it has landed;\r
+                        * either we've got a landed report or we haven't heard from it in\r
+                        * a long time\r
+                        */\r
+                       if (state.state >= AltosLib.ao_flight_drogue &&\r
+                           (last ||\r
+                            System.currentTimeMillis() - state.report_time >= 15000 ||\r
+                            state.state == AltosLib.ao_flight_landed))\r
+                       {\r
+                               if (Math.abs(state.baro_speed) < 20 && state.height < 100)\r
+                                       speak("rocket landed safely");\r
+                               else\r
+                                       speak("rocket may have crashed");\r
+                               if (state.from_pad != null)\r
+                                       speak(String.format("Bearing %d degrees, range %d meters.",\r
+                                                           (int) (state.from_pad.bearing + 0.5),\r
+                                                           (int) (state.from_pad.distance + 0.5)));\r
+                               ++reported_landing;\r
+                       }\r
+               }\r
+\r
+               long now () {\r
+                       return System.currentTimeMillis();\r
+               }\r
+\r
+               void set_report_time() {\r
+                       report_time = now() + report_interval;\r
+               }\r
+\r
+               public void run () {\r
+                       try {\r
+                               for (;;) {\r
+                                       set_report_time();\r
+                                       for (;;) {\r
+                                               synchronized (this) {\r
+                                                       long sleep_time = report_time - now();\r
+                                                       if (sleep_time <= 0)\r
+                                                               break;\r
+                                                       wait(sleep_time);\r
+                                               }\r
+                                       }\r
+                                       report(false);\r
+                               }\r
+                       } catch (InterruptedException ie) {\r
+                       }\r
+               }\r
+\r
+               public synchronized void notice(AltosState new_state, boolean spoken) {\r
+                       AltosState old_state = state;\r
+                       state = new_state;\r
+                       if (!started && state.state > AltosLib.ao_flight_pad) {\r
+                               started = true;\r
+                               start();\r
+                       }\r
+\r
+                       if (state.state < AltosLib.ao_flight_drogue)\r
+                               report_interval = 10000;\r
+                       else\r
+                               report_interval = 20000;\r
+                       if (old_state != null && old_state.state != state.state) {\r
+                               report_time = now();\r
+                               this.notify();\r
+                       } else if (spoken)\r
+                               set_report_time();\r
+               }\r
+\r
+               public IdleThread() {\r
+                       state = null;\r
+                       reported_landing = 0;\r
+                       report_interval = 10000;\r
+               }\r
+       }\r
+\r
+}\r