diff --git a/androidgcs/src/org/openpilot/androidgcs/OPTelemetryService.java b/androidgcs/src/org/openpilot/androidgcs/OPTelemetryService.java index aa26181a9..179f4f36c 100644 --- a/androidgcs/src/org/openpilot/androidgcs/OPTelemetryService.java +++ b/androidgcs/src/org/openpilot/androidgcs/OPTelemetryService.java @@ -135,7 +135,6 @@ public class OPTelemetryService extends Service { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(OPTelemetryService.this); if(prefs.getBoolean("autoconnect", false)) { - Toast.makeText(getApplicationContext(), "Should auto connect", Toast.LENGTH_SHORT).show(); Message msg = mServiceHandler.obtainMessage(); msg.arg1 = MSG_CONNECT; msg.arg2 = 0; diff --git a/androidgcs/src/org/openpilot/uavtalk/Telemetry.java b/androidgcs/src/org/openpilot/uavtalk/Telemetry.java index ae1eb10b7..16a527088 100644 --- a/androidgcs/src/org/openpilot/uavtalk/Telemetry.java +++ b/androidgcs/src/org/openpilot/uavtalk/Telemetry.java @@ -457,8 +457,6 @@ public class Telemetry { if ( objInfo.obj.getObjID() != objMngr.getObject("GCSTelemetryStats").getObjID() ) { if (DEBUG) Log.d(TAG,"transactionCompleted(false) due to receiving object not GCSTelemetryStats while not connected."); - System.out.println(gcsStatsObj.toString()); - System.out.println(objInfo.obj.toString()); objInfo.obj.transactionCompleted(false); return; } diff --git a/androidgcs/src/org/openpilot/uavtalk/UAVObject.java b/androidgcs/src/org/openpilot/uavtalk/UAVObject.java index da93e9889..cf195799f 100644 --- a/androidgcs/src/org/openpilot/uavtalk/UAVObject.java +++ b/androidgcs/src/org/openpilot/uavtalk/UAVObject.java @@ -113,7 +113,7 @@ public abstract class UAVObject { updateRequestedListeners.addObserver(o); } } - void updateRequested() { + public void updateRequested() { synchronized(updateRequestedListeners) { updateRequestedListeners.event(); } diff --git a/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java b/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java index 18c303734..e75724c08 100644 --- a/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java +++ b/androidgcs/src/org/openpilot/uavtalk/UAVTalk.java @@ -182,22 +182,15 @@ public class UAVTalk extends Observable { try { // inStream.wait(); val = inStream.read(); - } /* - * catch (InterruptedException e) { // TODO Auto-generated catch - * block System.out.println("Connection was aborted\n"); - * e.printStackTrace(); break; } - */catch (IOException e) { - // TODO Auto-generated catch block - System.out.println("Error reading from stream\n"); - e.printStackTrace(); - return false; - } - if (val == -1) { - System.out.println("End of stream, terminating processInputStream thread"); - return false; - } + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return false; + } + if (val == -1) { + return false; + } - //System.out.println("Received byte " + val + " in state + " + rxState); processInputByte(val); return true; }