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
c35c0fe3
Commit
c35c0fe3
authored
Apr 06, 2019
by
Matej Frančeškin
Committed by
Lorenz Meier
May 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Taisync didn't reconnect if the USB is not unplugged and plugged again
parent
b363fbe3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
11 deletions
+27
-11
QGCActivity.java
android/src/org/mavlink/qgroundcontrol/QGCActivity.java
+27
-11
No files found.
android/src/org/mavlink/qgroundcontrol/QGCActivity.java
View file @
c35c0fe3
...
...
@@ -76,6 +76,7 @@ public class QGCActivity extends QtActivity
private
static
final
String
ACTION_USB_PERMISSION
=
"org.mavlink.qgroundcontrol.action.USB_PERMISSION"
;
private
static
PendingIntent
_usbPermissionIntent
=
null
;
private
TaiSync
taiSync
=
null
;
private
Timer
probeAccessoriesTimer
=
null
;
public
static
Context
m_context
;
...
...
@@ -225,7 +226,15 @@ public class QGCActivity extends QtActivity
IntentFilter
accessoryFilter
=
new
IntentFilter
(
ACTION_USB_PERMISSION
);
filter
.
addAction
(
UsbManager
.
ACTION_USB_ACCESSORY_DETACHED
);
registerReceiver
(
mOpenAccessoryReceiver
,
accessoryFilter
);
probeAccessories
();
probeAccessoriesTimer
=
new
Timer
();
probeAccessoriesTimer
.
schedule
(
new
TimerTask
()
{
@Override
public
void
run
()
{
probeAccessories
();
}
},
0
,
3000
);
}
catch
(
Exception
e
)
{
Log
.
e
(
TAG
,
"Exception: "
+
e
);
}
...
...
@@ -243,6 +252,9 @@ public class QGCActivity extends QtActivity
@Override
protected
void
onDestroy
()
{
if
(
probeAccessoriesTimer
!=
null
)
{
probeAccessoriesTimer
.
cancel
();
}
unregisterReceiver
(
mOpenAccessoryReceiver
);
try
{
if
(
_wakeLock
!=
null
)
{
...
...
@@ -706,22 +718,26 @@ public class QGCActivity extends QtActivity
}
}
Object
probeAccessoriesLock
=
new
Object
();
private
void
probeAccessories
()
{
final
PendingIntent
pendingIntent
=
PendingIntent
.
getBroadcast
(
this
,
0
,
new
Intent
(
ACTION_USB_PERMISSION
),
0
);
new
Thread
(
new
Runnable
()
{
public
void
run
()
{
Log
.
i
(
TAG
,
"probeAccessories"
);
UsbAccessory
[]
accessories
=
_usbManager
.
getAccessoryList
();
if
(
accessories
!=
null
)
{
for
(
UsbAccessory
usbAccessory
:
accessories
)
{
if
(
_usbManager
.
hasPermission
(
usbAccessory
))
{
openAccessory
(
usbAccessory
);
}
else
{
Log
.
i
(
TAG
,
"requestPermission"
);
_usbManager
.
requestPermission
(
usbAccessory
,
pendingIntent
);
synchronized
(
openAccessoryLock
)
{
Log
.
i
(
TAG
,
"probeAccessories"
);
UsbAccessory
[]
accessories
=
_usbManager
.
getAccessoryList
();
if
(
accessories
!=
null
)
{
for
(
UsbAccessory
usbAccessory
:
accessories
)
{
if
(
_usbManager
.
hasPermission
(
usbAccessory
))
{
openAccessory
(
usbAccessory
);
}
else
{
Log
.
i
(
TAG
,
"requestPermission"
);
_usbManager
.
requestPermission
(
usbAccessory
,
pendingIntent
);
}
}
}
}
}
}
}).
start
();
...
...
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