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
ff7f97bc
Commit
ff7f97bc
authored
Mar 23, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3052 from mazgch/master
added u-blox USB device IDs
parents
7c6397de
d1472d3e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
CdcAcmSerialDriver.java
...com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java
+7
-0
UsbId.java
android/src/com/hoho/android/usbserial/driver/UsbId.java
+6
-0
No files found.
android/src/com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java
View file @
ff7f97bc
...
@@ -246,6 +246,13 @@ public class CdcAcmSerialDriver extends CommonUsbSerialDriver {
...
@@ -246,6 +246,13 @@ public class CdcAcmSerialDriver extends CommonUsbSerialDriver {
new
int
[]
{
new
int
[]
{
UsbId
.
DEVICE_PX4FMU
,
UsbId
.
DEVICE_PX4FMU
,
});
});
supportedDevices
.
put
(
Integer
.
valueOf
(
UsbId
.
VENDOR_UBLOX
),
new
int
[]
{
UsbId
.
DEVICE_UBLOX_5
,
UsbId
.
DEVICE_UBLOX_6
,
UsbId
.
DEVICE_UBLOX_7
,
UsbId
.
DEVICE_UBLOX_8
,
});
return
supportedDevices
;
return
supportedDevices
;
}
}
...
...
android/src/com/hoho/android/usbserial/driver/UsbId.java
View file @
ff7f97bc
...
@@ -62,6 +62,12 @@ public final class UsbId {
...
@@ -62,6 +62,12 @@ public final class UsbId {
public
static
final
int
VENDOR_PROLIFIC
=
0x067b
;
public
static
final
int
VENDOR_PROLIFIC
=
0x067b
;
public
static
final
int
PROLIFIC_PL2303
=
0x2303
;
public
static
final
int
PROLIFIC_PL2303
=
0x2303
;
public
static
final
int
VENDOR_UBLOX
=
0x1546
;
public
static
final
int
DEVICE_UBLOX_5
=
0x01a5
;
public
static
final
int
DEVICE_UBLOX_6
=
0x01a6
;
public
static
final
int
DEVICE_UBLOX_7
=
0x01a7
;
public
static
final
int
DEVICE_UBLOX_8
=
0x01a8
;
private
UsbId
()
{
private
UsbId
()
{
throw
new
IllegalAccessError
(
"Non-instantiable class."
);
throw
new
IllegalAccessError
(
"Non-instantiable class."
);
}
}
...
...
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