X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=3855f6f9a262670f7c4925e940cd1485fb0b25ef;hb=162c640d382b9f823573578fe97584adc94cd9b6;hp=5631ffb7777346e291838e87fe6f9d10798fb5ff;hpb=6441437d3b0e848b225a3d6c78ab00e2590c6988;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 5631ffb7..3855f6f9 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -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;
@@ -47,7 +48,7 @@ import android.view.Window;
 //import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
-import org.altusmetrum.AltosDroid.R;
+//import org.altusmetrum.AltosDroid.R;
 
 /**
  * This is the main Activity that displays the current chat session.
@@ -60,12 +61,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,11 +113,12 @@ 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
@@ -131,7 +130,7 @@ public class AltosDroid extends Activity {
 			case MSG_TOAST:
 				Toast.makeText(
 						ad.getApplicationContext(),
-						msg.getData().getString(KEY_TOAST),
+						(String) msg.obj,
 						Toast.LENGTH_SHORT).show();
 				break;
 			}