From fbd5aae8c67ef7695cc31aa3c9d450a3e0ce46cb Mon Sep 17 00:00:00 2001 From: px4dev Date: Sat, 3 Aug 2013 19:41:37 -0700 Subject: Revert "Merged USB ID changes to match bootloader" This reverts commit 8e599e4a3cf1d89c5ce4d1e8f1020fe047e0a55c. --- nuttx-configs/px4fmu-v2/nsh/defconfig | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'nuttx-configs') diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index fcc7c7df9..2e73a5a07 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -652,12 +652,10 @@ CONFIG_USBDEV_MAXPOWER=500 CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_EP0MAXPACKET=64 -# the endpoint addresses are chosen to match the -# bootloader for the FMUv2 -CONFIG_CDCACM_EPINTIN=3 +CONFIG_CDCACM_EPINTIN=1 CONFIG_CDCACM_EPINTIN_FSSIZE=64 CONFIG_CDCACM_EPINTIN_HSSIZE=64 -CONFIG_CDCACM_EPBULKOUT=1 +CONFIG_CDCACM_EPBULKOUT=3 CONFIG_CDCACM_EPBULKOUT_FSSIZE=64 CONFIG_CDCACM_EPBULKOUT_HSSIZE=512 CONFIG_CDCACM_EPBULKIN=2 @@ -666,15 +664,12 @@ CONFIG_CDCACM_EPBULKIN_HSSIZE=512 CONFIG_CDCACM_NWRREQS=4 CONFIG_CDCACM_NRDREQS=4 CONFIG_CDCACM_BULKIN_REQLEN=96 -CONFIG_CDCACM_RXBUFSIZE=512 -CONFIG_CDCACM_TXBUFSIZE=512 -# these IDs are chosen to match the bootloader, to prevent -# windows from seeing it as a new device when switching from -# bootloader mode to flight mode +CONFIG_CDCACM_RXBUFSIZE=256 +CONFIG_CDCACM_TXBUFSIZE=256 CONFIG_CDCACM_VENDORID=0x26ac -CONFIG_CDCACM_PRODUCTID=0x0016 +CONFIG_CDCACM_PRODUCTID=0x0010 CONFIG_CDCACM_VENDORSTR="3D Robotics" -CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v2,0" +CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v2.x" # CONFIG_USBMSC is not set # CONFIG_USBHOST is not set # CONFIG_WIRELESS is not set -- cgit v1.2.3