Commit 79c101fb authored by Ilya Kitaev's avatar Ilya Kitaev Committed by Andreas Bircher

debug logs for android serial-usb code

Conflicts:
	libs/mavlink/include/mavlink/v1.0
	mavlink_generator
	src/GPS/Drivers
parent 15b5fdde
...@@ -84,6 +84,7 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen ...@@ -84,6 +84,7 @@ 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)
{ {
Log.d(TAG, "UsbIoManager.Listener.onNewData: read " + dataA.length + " bytes);
nativeDeviceNewData(userDataA, dataA); nativeDeviceNewData(userDataA, dataA);
} }
}; };
...@@ -384,8 +385,10 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen ...@@ -384,8 +385,10 @@ 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);
...@@ -418,8 +421,10 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen ...@@ -418,8 +421,10 @@ 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
{ {
...@@ -482,15 +487,21 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen ...@@ -482,15 +487,21 @@ 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
{ {
return driverL.write(sourceA, timeoutMSecA); 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;
} }
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