From: Mike Beattie Date: Thu, 30 Aug 2012 09:08:41 +0000 (+1200) Subject: altosdroid: Implement voice just like altosui X-Git-Tag: 1.1~43^2 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=a8ecf3aa4e88d4c76643fb541fb1d5535a454aba;ds=sidebyside altosdroid: Implement voice just like altosui Signed-off-by: Mike Beattie --- diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index bc129fee..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; @@ -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 index 00000000..3f7c5979 --- /dev/null +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java @@ -0,0 +1,203 @@ +/* + * Copyright © 2011 Keith Packard + * Copyright © 2012 Mike Beattie + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +package org.altusmetrum.AltosDroid; + +import android.speech.tts.TextToSpeech; +import android.speech.tts.TextToSpeech.OnInitListener; + +import org.altusmetrum.AltosLib.*; + +public class AltosVoice { + + private TextToSpeech tts = null; + private boolean tts_enabled = false; + + private IdleThread idle_thread = null; + + private AltosState old_state = null; + + public AltosVoice(AltosDroid a) { + + tts = new TextToSpeech(a, new OnInitListener() { + public void onInit(int status) { + if (status == TextToSpeech.SUCCESS) tts_enabled = true; + if (tts_enabled) { + speak("AltosDroid ready"); + idle_thread = new IdleThread(); + } + } + }); + + } + + public void speak(String s) { + if (!tts_enabled) return; + tts.speak(s, TextToSpeech.QUEUE_ADD, null); + } + + public void stop() { + if (tts != null) tts.shutdown(); + if (idle_thread != null) { + idle_thread.interrupt(); + idle_thread = null; + } + } + + public void tell(AltosState state) { + if (!tts_enabled) return; + + boolean spoke = false; + if (old_state == null || old_state.state != state.state) { + speak(state.data.state()); + if ((old_state == null || old_state.state <= AltosLib.ao_flight_boost) && + state.state > AltosLib.ao_flight_boost) { + speak(String.format("max speed: %d meters per second.", (int) (state.max_speed + 0.5))); + spoke = true; + } else if ((old_state == null || old_state.state < AltosLib.ao_flight_drogue) && + state.state >= AltosLib.ao_flight_drogue) { + speak(String.format("max height: %d meters.", (int) (state.max_height + 0.5))); + spoke = true; + } + } + if (old_state == null || old_state.gps_ready != state.gps_ready) { + if (state.gps_ready) { + speak("GPS ready"); + spoke = true; + } else if (old_state != null) { + speak("GPS lost"); + spoke = true; + } + } + old_state = state; + idle_thread.notice(state, spoke); + } + + + class IdleThread extends Thread { + boolean started; + private AltosState state; + int reported_landing; + int report_interval; + long report_time; + + public synchronized void report(boolean last) { + if (state == null) + return; + + /* reset the landing count once we hear about a new flight */ + if (state.state < AltosLib.ao_flight_drogue) + reported_landing = 0; + + /* Shut up once the rocket is on the ground */ + if (reported_landing > 2) { + return; + } + + /* If the rocket isn't on the pad, then report height */ + if (AltosLib.ao_flight_drogue <= state.state && + state.state < AltosLib.ao_flight_landed && + state.range >= 0) + { + speak(String.format("Height %d, bearing %s %d, elevation %d, range %d.\n", + (int) (state.height + 0.5), + state.from_pad.bearing_words( + AltosGreatCircle.BEARING_VOICE), + (int) (state.from_pad.bearing + 0.5), + (int) (state.elevation + 0.5), + (int) (state.range + 0.5))); + } else if (state.state > AltosLib.ao_flight_pad) { + speak(String.format("%d meters", (int) (state.height + 0.5))); + } else { + reported_landing = 0; + } + + /* If the rocket is coming down, check to see if it has landed; + * either we've got a landed report or we haven't heard from it in + * a long time + */ + if (state.state >= AltosLib.ao_flight_drogue && + (last || + System.currentTimeMillis() - state.report_time >= 15000 || + state.state == AltosLib.ao_flight_landed)) + { + if (Math.abs(state.baro_speed) < 20 && state.height < 100) + speak("rocket landed safely"); + else + speak("rocket may have crashed"); + if (state.from_pad != null) + speak(String.format("Bearing %d degrees, range %d meters.", + (int) (state.from_pad.bearing + 0.5), + (int) (state.from_pad.distance + 0.5))); + ++reported_landing; + } + } + + long now () { + return System.currentTimeMillis(); + } + + void set_report_time() { + report_time = now() + report_interval; + } + + public void run () { + try { + for (;;) { + set_report_time(); + for (;;) { + synchronized (this) { + long sleep_time = report_time - now(); + if (sleep_time <= 0) + break; + wait(sleep_time); + } + } + report(false); + } + } catch (InterruptedException ie) { + } + } + + public synchronized void notice(AltosState new_state, boolean spoken) { + AltosState old_state = state; + state = new_state; + if (!started && state.state > AltosLib.ao_flight_pad) { + started = true; + start(); + } + + if (state.state < AltosLib.ao_flight_drogue) + report_interval = 10000; + else + report_interval = 20000; + if (old_state != null && old_state.state != state.state) { + report_time = now(); + this.notify(); + } else if (spoken) + set_report_time(); + } + + public IdleThread() { + state = null; + reported_landing = 0; + report_interval = 10000; + } + } + +}