import android.widget.TextView;
import android.widget.Toast;
+import org.altusmetrum.AltosLib.*;
+
/**
* This is the main Activity that displays the current chat session.
*/
private Messenger mService = null;
final Messenger mMessenger = new Messenger(new IncomingHandler(this));
- // Name of the connected device
- private String mConnectedDeviceName = null;
+ // TeleBT Config data
+ private AltosConfigData mConfigData = null;
// Local Bluetooth adapter
private BluetoothAdapter mBluetoothAdapter = null;
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();
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);
+ ad.mSerialView.setText("");
break;
}
break;
import android.util.Log;
import android.widget.Toast;
-//import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.AltosLib.*;
public class TelemetryService extends Service {
// Name of the connected device
private BluetoothDevice device = null;
private AltosBluetooth mAltosBluetooth = null;
+ private AltosConfigData mConfigData = null;
private TelemetryReader mTelemetryReader = null;
// internally track state of bluetooth connection
case MSG_REGISTER_CLIENT:
s.mClients.add(msg.replyTo);
try {
- msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_DEVNAME, s.device.getName()));
- msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, s.state, -1));
+ // Now we try to send the freshly connected UI any relavant information about what
+ // we're talking to - Basically state and Config Data.
+ msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, s.state, -1, s.mConfigData));
} catch (RemoteException e) {
s.mClients.remove(msg.replyTo);
}
mAltosBluetooth = null;
}
device = null;
+ mConfigData = null;
}
private void startAltosBluetooth() {
if (D) Log.d(TAG, "setState(): " + state + " -> " + s);
state = s;
- sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1));
+ // This shouldn't be required - mConfigData should be null for any non-connected
+ // state, but to be safe and to reduce message size
+ AltosConfigData acd = (state == STATE_CONNECTED) ? mConfigData : null;
+
+ sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1, acd));
}
private void connected() {
- sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, device.getName()));
- setState(STATE_CONNECTED);
try {
- sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVCONFIG, mAltosBluetooth.config_data()));
+ mConfigData = mAltosBluetooth.config_data();
} catch (InterruptedException e) {
} catch (TimeoutException e) {
+ // If this timed out, then we really want to retry it, but
+ // probably safer to just retry the connection from scratch.
+ mHandler.obtainMessage(MSG_CONNECT_FAILED).sendToTarget();
+ return;
}
+
+ setState(STATE_CONNECTED);
+
mTelemetryReader = new TelemetryReader(mAltosBluetooth, mHandler);
mTelemetryReader.start();
}