Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

USB: Adding support for direct connections to the Pixhawk. #816

Merged
merged 1 commit into from
Jun 19, 2014
Merged

USB: Adding support for direct connections to the Pixhawk. #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Android/res/xml/device_filter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<usb-device vendor-id="1412" product-id="45088" /> <!-- REX-USB60F -->
<usb-device vendor-id="9025" product-id="16" /><!-- APM 2.5 device -->
<usb-device vendor-id="9900" product-id="16" /><!-- APM 2.5 device -->
<usb-device vendor-id="9900" product-id="17" /><!-- Pixhawk device -->
<usb-device vendor-id="5824" product-id="1155" /><!-- Teensyduino -->
<usb-device vendor-id="4292" product-id="60000" /><!-- CP210x UART Bridge -->
<usb-device vendor-id="1118" product-id="688"/>
Expand Down
1 change: 1 addition & 0 deletions ...or-android/UsbSerialLibrary/src/com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ public static Map<Integer, int[]> getSupportedDevices() {
supportedDevices.put(Integer.valueOf(UsbId.VENDOR_ARDUINO2),
new int[] {
UsbId.VAN_OOIJEN_TECH_TEENSYDUINO_SERIAL,
UsbId.PIXHAWK,
});
return supportedDevices;
}
Expand Down
1 change: 1 addition & 0 deletions usb-serial-for-android/UsbSerialLibrary/src/com/hoho/android/usbserial/driver/UsbId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public final class UsbId {
public static final int ARDUINO_MEGA_ADK_R3 = 0x0044;
public static final int ARDUINO_SERIAL_ADAPTER_R3 = 0x0044;
public static final int ARDUINO_LEONARDO = 0x8036;
public static final int PIXHAWK = 0x0011;

public static final int VENDOR_VAN_OOIJEN_TECH = 0x16c0;
public static final int VAN_OOIJEN_TECH_TEENSYDUINO_SERIAL = 0x0483;
Expand Down