From 8756488670b2a7351c9d4e421b6357ac33d27228 Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Mon, 21 Aug 2017 22:34:30 +0300 Subject: [PATCH] Fixed syntax error Conflicts: libs/mavlink/include/mavlink/v1.0 mavlink_generator src/GPS/Drivers --- android/src/org/mavlink/qgroundcontrol/QGCActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/org/mavlink/qgroundcontrol/QGCActivity.java b/android/src/org/mavlink/qgroundcontrol/QGCActivity.java index 7a458fcb3..436beee27 100644 --- a/android/src/org/mavlink/qgroundcontrol/QGCActivity.java +++ b/android/src/org/mavlink/qgroundcontrol/QGCActivity.java @@ -84,7 +84,7 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen @Override public void onNewData(final byte[] dataA, int userDataA) { - Log.d(TAG, "UsbIoManager.Listener.onNewData: read " + dataA.length + " bytes); + Log.d(TAG, "UsbIoManager.Listener.onNewData: read " + dataA.length + " bytes"); nativeDeviceNewData(userDataA, dataA); } }; @@ -494,7 +494,7 @@ public class QGCActivity extends QtActivity implements TextToSpeech.OnInitListen try { - Log.d(TAG, "write: about to write " + sourceA.length + " bytes); + 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; -- 2.22.0