X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=cf982eac964b13fcc4bc0049b7db97a0a34c0d10;hb=03563c765d8b0ab3689c91b2b533c68e11650577;hp=3e9998e5f09681b79c716aa6654cc7a9cd947b12;hpb=58d2b70575f3616a056d2356a737b3be15ed3d66;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 3e9998e5..cf982eac 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -60,12 +60,9 @@ public class AltosDroid extends Activity {
 	// Message types sent from the TelemetryService 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_TOAST           = 3;
+	public static final int MSG_DEVCONFIG       = 4;
+	public static final int MSG_TELEMETRY       = 5;
 
 	// Intent request codes
 	private static final int REQUEST_CONNECT_DEVICE = 1;
@@ -115,22 +112,24 @@ public class AltosDroid extends Activity {
 					break;
 				}
 				break;
-			case MSG_INCOMING_TELEM:
-				byte[] buf = (byte[]) msg.obj;
+			case MSG_DEVCONFIG:
+			case MSG_TELEMETRY:
+				//byte[] buf = (byte[]) msg.obj;
 				// construct a string from the buffer
-				String telem = new String(buf);
-				ad.mSerialView.append(telem);
+				//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 = (String) msg.obj;
+				if (ad.mConnectedDeviceName != null)
+					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),
+						(String) msg.obj,
 						Toast.LENGTH_SHORT).show();
 				break;
 			}