rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/stac/usb-composite-device-v2' into next

Browse Source
This commit is contained in:
Stacey Sheldon 2012-01-07 13:35:42 -05:00
commit b0d1551cc2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/PiOS/Common/pios_usb_desc_hid_cdc.c
View File

@ -61,7 +61,7 @@ const struct usb_board_config PIOS_USB_BOARD_Configuration = {
.iad = { .iad = {
.bLength = sizeof(struct usb_interface_association_desc), .bLength = sizeof(struct usb_interface_association_desc),
.bDescriptorType = USB_DESC_TYPE_IAD, .bDescriptorType = USB_DESC_TYPE_IAD,
.bFirstInterface = 1, .bFirstInterface = 0,
.bInterfaceCount = 2, .bInterfaceCount = 2,
.bFunctionClass = 2, /* Communication */ .bFunctionClass = 2, /* Communication */
.bFunctionSubClass = 2, /* Abstract Control Model */ .bFunctionSubClass = 2, /* Abstract Control Model */
@ -146,7 +146,7 @@ const struct usb_board_config PIOS_USB_BOARD_Configuration = {
.bDescriptorType = USB_DESC_TYPE_ENDPOINT, .bDescriptorType = USB_DESC_TYPE_ENDPOINT,
.bEndpointAddress = USB_EP_IN(2), .bEndpointAddress = USB_EP_IN(2),
.bmAttributes = USB_EP_ATTR_TT_INTERRUPT, .bmAttributes = USB_EP_ATTR_TT_INTERRUPT,
.wMaxPacketSize = htousbs(16), .wMaxPacketSize = htousbs(PIOS_USB_BOARD_CDC_MGMT_LENGTH),
.bInterval = 4, /* ms */ .bInterval = 4, /* ms */
}, },
.cdc_data_if = { .cdc_data_if = {

2
make/boards/coptercontrol/board-info.mk
View File

@ -1,6 +1,6 @@
BOARD_TYPE := 0x04 BOARD_TYPE := 0x04
BOARD_REVISION := 0x01 BOARD_REVISION := 0x01
BOOTLOADER_VERSION := 0x01 BOOTLOADER_VERSION := 0x02
HW_TYPE := 0x01 HW_TYPE := 0x01
MCU := cortex-m3 MCU := cortex-m3