X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=cf982eac964b13fcc4bc0049b7db97a0a34c0d10;hb=03563c765d8b0ab3689c91b2b533c68e11650577;hp=33da93466ac14406fca341673bdad98ca33d8418;hpb=ed653a1e6dc8884cb171af1406fd0999ef125a4d;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 33da9346..cf982eac 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -60,8 +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; + 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; @@ -111,11 +112,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