From bfa6cd8934b993bd4a67cfc7a4eeecf9b11915ef Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 23 Jun 2015 21:39:09 -0700 Subject: altosdroid: Change voice output around This makes the voice output depend on the current displayed tab; where the 'recovery' and 'map' tabs get the same value. Pad Reports igniter and GPS status changes Flight Report flight state changes and max height after apogee Report current speed, height and bearing/elevation/range once every 10 seconds while the rocket is in motion. Recovery Report distance and bearing when the location of either the tracker or the receiver changes by more than 10m, but not more than once every 10 seconds. Signed-off-by: Keith Packard --- altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '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 c2a6cb29..db7815f3 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -466,8 +466,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener { for (AltosDroidTab mTab : mTabs) mTab.update_ui(telem_state, state, from_receiver, location, mTab == mTabsAdapter.currentItem()); - if (state != null && mAltosVoice != null) - mAltosVoice.tell(state, from_receiver); + if (mAltosVoice != null) + mAltosVoice.tell(telem_state, state, from_receiver, location, (AltosDroidTab) mTabsAdapter.currentItem()); saved_state = state; } -- cgit v1.2.3