diff --git a/android/src/org/mavlink/qgroundcontrol/QGCActivity.java b/android/src/org/mavlink/qgroundcontrol/QGCActivity.java index 7cf432cb02c4d46f614b63ae457a0b25c60a5910..9ba95f2cfe91a468a6d8f4e042850b18c1f18df8 100644 --- a/android/src/org/mavlink/qgroundcontrol/QGCActivity.java +++ b/android/src/org/mavlink/qgroundcontrol/QGCActivity.java @@ -84,7 +84,6 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen @Override public void onNewData(final byte[] dataA, int userDataA) { - // IK: Log.d(TAG, "UsbIoManager.Listener.onNewData: read " + dataA.length + " bytes"); nativeDeviceNewData(userDataA, dataA); } }; @@ -199,7 +198,7 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen // MAKE SURE WE HAVE ENTRIES if (m_devices.size() <= 0) { - // Log.e(TAG, "No USB devices found"); + //Log.e(TAG, "No USB devices found"); return null; } @@ -385,10 +384,8 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen UsbSerialDriver driverL = m_openedDevices.get(idA); - if (driverL == null) { - Log.e(TAG, "startIoManager: no UsbSerialDriver found"); + if (driverL == null) return; - } UsbIoManager managerL = new UsbIoManager(driverL, m_Listener, m_userData.get(idA)); m_ioManager.put(idA, managerL); @@ -421,10 +418,8 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen { UsbSerialDriver driverL = m_openedDevices.get(idA); - if (driverL == null) { - Log.e(TAG, "setParameters: no UsbSerialDriver found"); + if (driverL == null) return false; - } try { @@ -487,21 +482,15 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen { UsbSerialDriver driverL = m_openedDevices.get(idA); - if (driverL == null) { - Log.e(TAG, "write: no UsbSerialDriver found"); + if (driverL == null) return 0; - } try { - // Log.d(TAG, "write: about to write " + sourceA.length + " bytes"); - int bytesWritten = driverL.write(sourceA, timeoutMSecA); - // Log.d(TAG, "write: successfully written " + bytesWritten + " bytes"); - return bytesWritten; + return driverL.write(sourceA, timeoutMSecA); } catch(IOException eA) { - Log.d(TAG, "write: exception " + eA.getMessage()); return 0; } /*