X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=625a2eee430d7f278a023264d47dbd8112911f3a;hp=3e9998e5f09681b79c716aa6654cc7a9cd947b12;hb=59dfcbe14622c20aaa7d5b131eece9f4c8db6887;hpb=58d2b70575f3616a056d2356a737b3be15ed3d66 diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 3e9998e5..625a2eee 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -1,5 +1,5 @@ /* - * Copyright © 2012 Mike Beattie + * Copyright © 2012-2013 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 @@ -18,6 +18,7 @@ package org.altusmetrum.AltosDroid; import java.lang.ref.WeakReference; + import android.app.Activity; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -25,47 +26,32 @@ import android.content.Intent; import android.content.Context; import android.content.ComponentName; import android.content.ServiceConnection; +import android.content.DialogInterface; import android.os.IBinder; import android.os.Bundle; 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.KeyEvent; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -//import android.view.View; import android.view.Window; -//import android.view.View.OnClickListener; -//import android.view.inputmethod.EditorInfo; -//import android.widget.Button; -//import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; -import org.altusmetrum.AltosDroid.R; +import android.app.AlertDialog; + +import org.altusmetrum.altoslib_1.*; -/** - * This is the main Activity that displays the current chat session. - */ public class AltosDroid extends Activity { // Debugging private static final String TAG = "AltosDroid"; private static final boolean D = true; - // Message types sent from the TelemetryService Handler + // Message types received by our Handler public static final int MSG_STATE_CHANGE = 1; - public static final int MSG_DEVNAME = 2; - public static final int MSG_INCOMING_TELEM = 3; - public static final int MSG_TOAST = 4; - - // Key names received from the TelemetryService Handler - public static final String KEY_DEVNAME = "key_devname"; - public static final String KEY_TOAST = "key_toast"; + public static final int MSG_TELEMETRY = 2; // Intent request codes private static final int REQUEST_CONNECT_DEVICE = 1; @@ -73,21 +59,40 @@ public class AltosDroid extends Activity { // Layout Views private TextView mTitle; - private TextView mSerialView; - //private EditText mOutEditText; - //private Button mSendButton; - private boolean mIsBound; - Messenger mService = null; + // Flight state values + private TextView mCallsignView; + private TextView mRSSIView; + private TextView mSerialView; + private TextView mFlightView; + private TextView mStateView; + private TextView mSpeedView; + private TextView mAccelView; + private TextView mRangeView; + private TextView mHeightView; + private TextView mElevationView; + private TextView mBearingView; + private TextView mLatitudeView; + private TextView mLongitudeView; + + // field to display the version at the bottom of the screen + private TextView mVersion; + + // Service + private boolean mIsBound = false; + private Messenger mService = null; final Messenger mMessenger = new Messenger(new IncomingHandler(this)); - // Name of the connected device - private String mConnectedDeviceName = null; + // Preferences + private AltosDroidPreferences prefs = null; + + // TeleBT Config data + private AltosConfigData mConfigData = null; // Local Bluetooth adapter private BluetoothAdapter mBluetoothAdapter = null; - private TextToSpeech tts; - private boolean tts_enabled = false; + // Text to Speech + private AltosVoice mAltosVoice = null; // The Handler that gets information back from the Telemetry Service static class IncomingHandler extends Handler { @@ -99,39 +104,28 @@ public class AltosDroid extends Activity { AltosDroid ad = mAltosDroid.get(); switch (msg.what) { case MSG_STATE_CHANGE: - if(D) Log.i(TAG, "MSG_STATE_CHANGE: " + msg.arg1); + if(D) Log.d(TAG, "MSG_STATE_CHANGE: " + msg.arg1); switch (msg.arg1) { case TelemetryService.STATE_CONNECTED: + ad.mConfigData = (AltosConfigData) msg.obj; + String str = String.format(" %s S/N: %d", ad.mConfigData.product, ad.mConfigData.serial); ad.mTitle.setText(R.string.title_connected_to); - ad.mTitle.append(ad.mConnectedDeviceName); - ad.mSerialView.setText(""); + ad.mTitle.append(str); + Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show(); + ad.mAltosVoice.speak("Connected"); break; case TelemetryService.STATE_CONNECTING: ad.mTitle.setText(R.string.title_connecting); break; case TelemetryService.STATE_READY: case TelemetryService.STATE_NONE: + ad.mConfigData = null; ad.mTitle.setText(R.string.title_not_connected); break; } break; - case MSG_INCOMING_TELEM: - byte[] buf = (byte[]) msg.obj; - // construct a string from the buffer - String telem = new String(buf); - ad.mSerialView.append(telem); - break; - case MSG_DEVNAME: - // save the connected device's name - ad.mConnectedDeviceName = msg.getData().getString(KEY_DEVNAME); - Toast.makeText(ad.getApplicationContext(), "Connected to " - + ad.mConnectedDeviceName, Toast.LENGTH_SHORT).show(); - break; - case MSG_TOAST: - Toast.makeText( - ad.getApplicationContext(), - msg.getData().getString(KEY_TOAST), - Toast.LENGTH_SHORT).show(); + case MSG_TELEMETRY: + ad.update_ui((AltosState) msg.obj); break; } } @@ -156,27 +150,70 @@ public class AltosDroid extends Activity { } }; + void doBindService() { + bindService(new Intent(this, TelemetryService.class), mConnection, Context.BIND_AUTO_CREATE); + mIsBound = true; + } + + void doUnbindService() { + if (mIsBound) { + // If we have received the service, and hence registered with it, then now is the time to unregister. + if (mService != null) { + try { + Message msg = Message.obtain(null, TelemetryService.MSG_UNREGISTER_CLIENT); + msg.replyTo = mMessenger; + mService.send(msg); + } catch (RemoteException e) { + // There is nothing special we need to do if the service has crashed. + } + } + // Detach our existing connection. + unbindService(mConnection); + mIsBound = false; + } + } + + public void registerTab(AltosDroidTab mTab) { + } + + public void unregisterTab(AltosDroidTab mTab) { + } + + 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()); + mSpeedView.setText(String.format("%6.0f m/s", state.speed())); + mAccelView.setText(String.format("%6.0f m/s²", state.acceleration)); + mRangeView.setText(String.format("%6.0f m", state.range)); + 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")); + mLongitudeView.setText(pos(state.gps.lon, "W", "E")); + + mAltosVoice.tell(state); + } + + static String pos(double p, String pos, String neg) { + String h = pos; + if (p < 0) { + h = neg; + p = -p; + } + int deg = (int) Math.floor(p); + double min = (p - Math.floor(p)) * 60.0; + return String.format("%d° %9.6f\" %s", deg, min, h); + } @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if(D) Log.e(TAG, "+++ ON CREATE +++"); - // Set up the window layout - requestWindowFeature(Window.FEATURE_CUSTOM_TITLE); - setContentView(R.layout.main); - getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title); - - // Set up the custom title - mTitle = (TextView) findViewById(R.id.title_left_text); - mTitle.setText(R.string.app_name); - mTitle = (TextView) findViewById(R.id.title_right_text); - - mSerialView = (TextView) findViewById(R.id.in); - mSerialView.setMovementMethod(new ScrollingMovementMethod()); - mSerialView.setClickable(false); - mSerialView.setLongClickable(false); - // Get local Bluetooth adapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); @@ -187,18 +224,41 @@ public class AltosDroid extends Activity { 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 ); - } - }); + // Initialise preferences + prefs = new AltosDroidPreferences(this); + AltosPreferences.init(prefs); - // Start Telemetry Service - startService(new Intent(AltosDroid.this, TelemetryService.class)); + // Set up the window layout + requestWindowFeature(Window.FEATURE_CUSTOM_TITLE); + setContentView(R.layout.altosdroid); + getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title); - doBindService(); + // Set up the custom title + mTitle = (TextView) findViewById(R.id.title_left_text); + mTitle.setText(R.string.app_name); + mTitle = (TextView) findViewById(R.id.title_right_text); + + // Display the Version + mVersion = (TextView) findViewById(R.id.version); + mVersion.setText("Version: " + BuildInfo.version + + " Built: " + BuildInfo.builddate + " " + BuildInfo.buildtime + " " + BuildInfo.buildtz + + " (" + BuildInfo.branch + "-" + BuildInfo.commitnum + "-" + BuildInfo.commithash + ")"); + + 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); + mRangeView = (TextView) findViewById(R.id.range_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); + + mAltosVoice = new AltosVoice(this); } @Override @@ -209,26 +269,18 @@ public class AltosDroid extends Activity { if (!mBluetoothAdapter.isEnabled()) { Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE); startActivityForResult(enableIntent, REQUEST_ENABLE_BT); - } else { - //if (mChatService == null) setupChat(); } + + // Start Telemetry Service + startService(new Intent(AltosDroid.this, TelemetryService.class)); + + doBindService(); } @Override public synchronized void onResume() { super.onResume(); if(D) Log.e(TAG, "+ ON RESUME +"); - - // Performing this check in onResume() covers the case in which BT was - // not enabled during onStart(), so we were paused to enable it... - // onResume() will be called when ACTION_REQUEST_ENABLE activity returns. - //if (mChatService != null) { - // Only if the state is STATE_NONE, do we know that we haven't started already - //if (mChatService.getState() == BluetoothChatService.STATE_NONE) { - // Start the Bluetooth chat services - //mChatService.start(); - //} - //} } @Override @@ -241,88 +293,18 @@ public class AltosDroid extends Activity { public void onStop() { super.onStop(); if(D) Log.e(TAG, "-- ON STOP --"); + + doUnbindService(); } @Override public void onDestroy() { super.onDestroy(); - - doUnbindService(); - - if (tts != null) tts.shutdown(); - if(D) Log.e(TAG, "--- ON DESTROY ---"); - } - - - -/* - private void setupChat() { - Log.d(TAG, "setupChat()"); - - // Initialize the compose field with a listener for the return key - mOutEditText = (EditText) findViewById(R.id.edit_text_out); - mOutEditText.setOnEditorActionListener(mWriteListener); - - // Initialize the send button with a listener that for click events - mSendButton = (Button) findViewById(R.id.button_send); - mSendButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - // Send a message using content of the edit text widget - TextView view = (TextView) findViewById(R.id.edit_text_out); - String message = view.getText().toString(); - sendMessage(message); - } - }); - // Initialize the BluetoothChatService to perform bluetooth connections - mChatService = new BluetoothChatService(this, mHandler); - - // Initialize the buffer for outgoing messages - mOutStringBuffer = new StringBuffer(""); - } -*/ - - /** - * Sends a message. - * @param message A string of text to send. - */ - /* - private void sendMessage(String message) { - // Check that we're actually connected before trying anything - if (mChatService.getState() != BluetoothChatService.STATE_CONNECTED) { - Toast.makeText(this, R.string.not_connected, Toast.LENGTH_SHORT).show(); - return; - } - - // Check that there's actually something to send - if (message.length() > 0) { - // Get the message bytes and tell the BluetoothChatService to write - byte[] send = message.getBytes(); - mChatService.write(send); - - // Reset out string buffer to zero and clear the edit text field - mOutStringBuffer.setLength(0); - mOutEditText.setText(mOutStringBuffer); - } + mAltosVoice.stop(); } - - // The action listener for the EditText widget, to listen for the return key - private TextView.OnEditorActionListener mWriteListener = - new TextView.OnEditorActionListener() { - public boolean onEditorAction(TextView view, int actionId, KeyEvent event) { - // If the action is a key-up event on the return key, send the message - if (actionId == EditorInfo.IME_NULL && event.getAction() == KeyEvent.ACTION_UP) { - String message = view.getText().toString(); - sendMessage(message); - } - if(D) Log.i(TAG, "END onEditorAction"); - return true; - } - }; - */ - public void onActivityResult(int requestCode, int resultCode, Intent data) { if(D) Log.d(TAG, "onActivityResult " + resultCode); switch (requestCode) { @@ -339,7 +321,7 @@ public class AltosDroid extends Activity { //setupChat(); } else { // User did not enable Bluetooth or an error occured - Log.d(TAG, "BT not enabled"); + Log.e(TAG, "BT not enabled"); stopService(new Intent(AltosDroid.this, TelemetryService.class)); Toast.makeText(this, R.string.bt_not_enabled, Toast.LENGTH_SHORT).show(); finish(); @@ -355,13 +337,9 @@ public class AltosDroid extends Activity { BluetoothDevice device = mBluetoothAdapter.getRemoteDevice(address); // Attempt to connect to the device try { - //Message msg = Message.obtain(null, TelemetryService.MSG_CONNECT_TELEBT); - //msg.obj = device; - //mService.send(msg); - if (D) Log.i(TAG, "Connecting to " + device.getName()); + if (D) Log.d(TAG, "Connecting to " + device.getName()); mService.send(Message.obtain(null, TelemetryService.MSG_CONNECT, device)); } catch (RemoteException e) { - e.printStackTrace(); } } @@ -372,6 +350,20 @@ public class AltosDroid extends Activity { return true; } + void setFrequency(double freq) { + try { + mService.send(Message.obtain(null, TelemetryService.MSG_SETFREQUENCY, freq)); + } catch (RemoteException e) { + } + } + + void setFrequency(String freq) { + try { + setFrequency (Double.parseDouble(freq.substring(11, 17))); + } catch (NumberFormatException e) { + } + } + @Override public boolean onOptionsItemSelected(MenuItem item) { Intent serverIntent = null; @@ -381,32 +373,35 @@ public class AltosDroid extends Activity { serverIntent = new Intent(this, DeviceListActivity.class); startActivityForResult(serverIntent, REQUEST_CONNECT_DEVICE); return true; + case R.id.select_freq: + // Set the TBT radio frequency + + final String[] frequencies = { + "Channel 0 (434.550MHz)", + "Channel 1 (434.650MHz)", + "Channel 2 (434.750MHz)", + "Channel 3 (434.850MHz)", + "Channel 4 (434.950MHz)", + "Channel 5 (435.050MHz)", + "Channel 6 (435.150MHz)", + "Channel 7 (435.250MHz)", + "Channel 8 (435.350MHz)", + "Channel 9 (435.450MHz)" + }; + + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle("Pick a frequency"); + builder.setItems(frequencies, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int item) { + setFrequency(frequencies[item]); + } + }); + AlertDialog alert = builder.create(); + alert.show(); + return true; } return false; } - - void doBindService() { - bindService(new Intent(this, TelemetryService.class), mConnection, Context.BIND_AUTO_CREATE); - mIsBound = true; - } - - void doUnbindService() { - if (mIsBound) { - // If we have received the service, and hence registered with it, then now is the time to unregister. - if (mService != null) { - try { - Message msg = Message.obtain(null, TelemetryService.MSG_UNREGISTER_CLIENT); - msg.replyTo = mMessenger; - mService.send(msg); - } catch (RemoteException e) { - // There is nothing special we need to do if the service has crashed. - } - } - // Detach our existing connection. - unbindService(mConnection); - mIsBound = false; - } - } - }