From 8ffa4f9a474026f5a6523b26919a78565e0ed74c Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 30 Aug 2012 13:13:20 +1200 Subject: altosdroid: move units into code, to match altosui Signed-off-by: Mike Beattie --- altosdroid/res/layout/altosdroid.xml | 82 ++-------------------- altosdroid/res/values/strings.xml | 6 -- .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 12 ++-- 3 files changed, 13 insertions(+), 87 deletions(-) diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml index 33d89d52..0392ba01 100644 --- a/altosdroid/res/layout/altosdroid.xml +++ b/altosdroid/res/layout/altosdroid.xml @@ -92,23 +92,11 @@ android:id="@+id/speed_value" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentRight="true" android:layout_below="@id/speed_label" - android:layout_toLeftOf="@+id/speed_units" android:text="" android:textAppearance="?android:attr/textAppearanceLarge" /> - - - - - - - - - - Callsign State Speed - m/s Acceleration - m/s² Range - m Altitude - m Azimuth - ° Bearing - ° Latitude Longitude diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index ba424e79..9ecce681 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -179,13 +179,13 @@ public class AltosDroid extends Activity { double speed = state.speed; if (!state.ascent) speed = state.baro_speed; - mSpeedView.setText(String.format("%6.0f", speed)); - mAccelView.setText(String.format("%6.0f", state.acceleration)); - mRangeView.setText(String.format("%6.0f", state.range)); - mAltitudeView.setText(String.format("%6.0f", state.height)); - mAzimuthView.setText(String.format("%3.0f", state.elevation)); + 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)); + mAltitudeView.setText(String.format("%6.0f m", state.height)); + mAzimuthView.setText(String.format("%3.0f°", state.elevation)); if (state.from_pad != null) - mBearingView.setText(String.format("%3.0f", state.from_pad.bearing)); + 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")); } -- cgit v1.2.3 From c32325af6605e78c1d1147d466f3ea12ce94124a Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 30 Aug 2012 13:19:41 +1200 Subject: altosdroid: rename azimuth/altitude to elevation/height respectively. (Matches altoslib, altosui, altos) Signed-off-by: Mike Beattie --- altosdroid/res/layout/altosdroid.xml | 22 +++++++++++----------- altosdroid/res/values/strings.xml | 4 ++-- .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml index 0392ba01..e4b4f605 100644 --- a/altosdroid/res/layout/altosdroid.xml +++ b/altosdroid/res/layout/altosdroid.xml @@ -150,7 +150,7 @@ + android:text="@string/height_label" /> + android:text="@string/elevation_label" /> @@ -226,7 +226,7 @@ android:id="@+id/latitude_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/azimuth_container" > + android:layout_below="@+id/elevation_container" > Speed Acceleration Range - Altitude - Azimuth + Height + Elevation Bearing Latitude Longitude diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 9ecce681..f8e60e28 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -69,8 +69,8 @@ public class AltosDroid extends Activity { private TextView mSpeedView; private TextView mAccelView; private TextView mRangeView; - private TextView mAltitudeView; - private TextView mAzimuthView; + private TextView mHeightView; + private TextView mElevationView; private TextView mBearingView; private TextView mLatitudeView; private TextView mLongitudeView; @@ -182,8 +182,8 @@ public class AltosDroid extends Activity { 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)); - mAltitudeView.setText(String.format("%6.0f m", state.height)); - mAzimuthView.setText(String.format("%3.0f°", state.elevation)); + 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")); @@ -228,8 +228,8 @@ public class AltosDroid extends Activity { mSpeedView = (TextView) findViewById(R.id.speed_value); mAccelView = (TextView) findViewById(R.id.accel_value); mRangeView = (TextView) findViewById(R.id.range_value); - mAltitudeView = (TextView) findViewById(R.id.altitude_value); - mAzimuthView = (TextView) findViewById(R.id.azimuth_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); -- cgit v1.2.3 From 2137a112b4217d84041f749b8aa5eb8f4d330ba0 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 30 Aug 2012 13:20:10 +1200 Subject: altosdroid: rework lat/lon to more common format Signed-off-by: Mike Beattie --- altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index f8e60e28..b44b8ce9 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -198,7 +198,7 @@ public class AltosDroid extends Activity { } int deg = (int) Math.floor(p); double min = (p - Math.floor(p)) * 60.0; - return String.format("%s %d° %9.6f", h, deg, min); + return String.format("%d° %9.6f\" %s", deg, min, h); } @Override -- cgit v1.2.3 From 91606c89828e60d8cf9a5ea4ff75b951d6fc042a Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 30 Aug 2012 13:21:38 +1200 Subject: altosdroid: formatting/whitespace, correct ids Signed-off-by: Mike Beattie --- altosdroid/res/layout/altosdroid.xml | 9 +++++---- altosdroid/res/values/strings.xml | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml index e4b4f605..56a910ec 100644 --- a/altosdroid/res/layout/altosdroid.xml +++ b/altosdroid/res/layout/altosdroid.xml @@ -55,7 +55,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_toRightOf="@+id/strut" > + android:layout_toRightOf="@id/strut" - - Latitude Longitude - -- cgit v1.2.3 From 14022b002d2201fb3ca28292d976c90e2d9a15a2 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 30 Aug 2012 13:23:04 +1200 Subject: altosdroid: rename ambiguous TextView name Signed-off-by: Mike Beattie --- .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index b44b8ce9..5736a4c7 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -63,7 +63,8 @@ public class AltosDroid extends Activity { // Layout Views private TextView mTitle; - private TextView mSerialView; + + // Flight state values private TextView mCallsignView; private TextView mStateView; private TextView mSpeedView; @@ -75,6 +76,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; @@ -108,7 +112,7 @@ public class AltosDroid extends Activity { ad.mTitle.append(str); Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show(); //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 +121,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; } } @@ -218,10 +222,10 @@ 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); mStateView = (TextView) findViewById(R.id.state_value); -- cgit v1.2.3 From 519887571cee2840024c5c8f4b7f0e5c352d3323 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 30 Aug 2012 13:23:29 +1200 Subject: altosdroid: add rssi/serial/flight, and re-work UI ordering Signed-off-by: Mike Beattie --- altosdroid/res/layout/altosdroid.xml | 80 ++++++++++++++++++++-- altosdroid/res/values/strings.xml | 3 + .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 9 +++ 3 files changed, 85 insertions(+), 7 deletions(-) diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml index 56a910ec..f185ea9f 100644 --- a/altosdroid/res/layout/altosdroid.xml +++ b/altosdroid/res/layout/altosdroid.xml @@ -51,11 +51,77 @@ + + + + + + + + + + + + + + + + + + + + + + android:layout_centerInParent="true" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textSize="50dip" /> @@ -79,7 +145,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_below="@+id/callsign_container" + android:layout_below="@+id/state_container" android:layout_toLeftOf="@+id/strut" > Callsign + Serial no. + Flight no. + RSSI State Speed Acceleration diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 5736a4c7..7d6a8044 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -66,6 +66,9 @@ public class AltosDroid extends Activity { // Flight state values private TextView mCallsignView; + private TextView mRSSIView; + private TextView mSerialView; + private TextView mFlightView; private TextView mStateView; private TextView mSpeedView; private TextView mAccelView; @@ -179,6 +182,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) @@ -228,6 +234,9 @@ public class AltosDroid extends Activity { 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); -- cgit v1.2.3 From 2e6af70c87e7cc62a92b09bbbde745a31d83b5eb Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 30 Aug 2012 21:08:06 +1200 Subject: altosdroid: Move bluetooth check to first task Signed-off-by: Mike Beattie --- .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 7d6a8044..bc129fee 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -216,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); @@ -247,16 +257,6 @@ 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) { -- cgit v1.2.3 From a8ecf3aa4e88d4c76643fb541fb1d5535a454aba Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 30 Aug 2012 21:08:41 +1200 Subject: altosdroid: Implement voice just like altosui Signed-off-by: Mike Beattie --- .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 19 +- .../src/org/altusmetrum/AltosDroid/AltosVoice.java | 203 +++++++++++++++++++++ 2 files changed, 209 insertions(+), 13 deletions(-) create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java 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; + } + } + +} -- cgit v1.2.3