Skip to content

Q
qgroundcontrol
Commit fde4a25f authored by Andreas Bircher's avatar Andreas Bircher
Browse files
Options

cleaning up the logging

parent d58460bb
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 16 deletions
android/src/org/mavlink/qgroundcontrol/QGCActivity.java
View file @ fde4a25f
...@@ -84,7 +84,6 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen ...@@ -84,7 +84,6 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen
@Override @Override
public void onNewData(final byte[] dataA, int userDataA) public void onNewData(final byte[] dataA, int userDataA)
{ {
// IK: Log.d(TAG, "UsbIoManager.Listener.onNewData: read " + dataA.length + " bytes");
nativeDeviceNewData(userDataA, dataA); nativeDeviceNewData(userDataA, dataA);
} }
}; };
...@@ -199,7 +198,7 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen ...@@ -199,7 +198,7 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen
// MAKE SURE WE HAVE ENTRIES // MAKE SURE WE HAVE ENTRIES
if (m_devices.size() <= 0) if (m_devices.size() <= 0)
{ {
// Log.e(TAG, "No USB devices found"); //Log.e(TAG, "No USB devices found");
return null; return null;
} }
...@@ -385,10 +384,8 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen ...@@ -385,10 +384,8 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen
UsbSerialDriver driverL = m_openedDevices.get(idA); UsbSerialDriver driverL = m_openedDevices.get(idA);
if (driverL == null) { if (driverL == null)
Log.e(TAG, "startIoManager: no UsbSerialDriver found");
return; return;
}
UsbIoManager managerL = new UsbIoManager(driverL, m_Listener, m_userData.get(idA)); UsbIoManager managerL = new UsbIoManager(driverL, m_Listener, m_userData.get(idA));
m_ioManager.put(idA, managerL); m_ioManager.put(idA, managerL);
...@@ -421,10 +418,8 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen ...@@ -421,10 +418,8 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen
{ {
UsbSerialDriver driverL = m_openedDevices.get(idA); UsbSerialDriver driverL = m_openedDevices.get(idA);
if (driverL == null) { if (driverL == null)
Log.e(TAG, "setParameters: no UsbSerialDriver found");
return false; return false;
}
try try
{ {
...@@ -487,21 +482,15 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen ...@@ -487,21 +482,15 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen
{ {
UsbSerialDriver driverL = m_openedDevices.get(idA); UsbSerialDriver driverL = m_openedDevices.get(idA);
if (driverL == null) { if (driverL == null)
Log.e(TAG, "write: no UsbSerialDriver found");
return 0; return 0;
}
try try
{ {
// Log.d(TAG, "write: about to write " + sourceA.length + " bytes"); return driverL.write(sourceA, timeoutMSecA);
int bytesWritten = driverL.write(sourceA, timeoutMSecA);
// Log.d(TAG, "write: successfully written " + bytesWritten + " bytes");
return bytesWritten;
} }
catch(IOException eA) catch(IOException eA)
{ {
Log.d(TAG, "write: exception " + eA.getMessage());
return 0; return 0;
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment