Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
fde4a25f
Commit
fde4a25f
authored
Sep 05, 2017
by
Andreas Bircher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleaning up the logging
parent
d58460bb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
16 deletions
+5
-16
QGCActivity.java
android/src/org/mavlink/qgroundcontrol/QGCActivity.java
+5
-16
No files found.
android/src/org/mavlink/qgroundcontrol/QGCActivity.java
View file @
fde4a25f
...
...
@@ -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
;
}
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment