aboutsummaryrefslogtreecommitdiff
path: root/nuttx-configs/px4fmu-v2
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-08-03 19:41:37 -0700
committerpx4dev <px4@purgatory.org>2013-08-03 19:41:37 -0700
commitfbd5aae8c67ef7695cc31aa3c9d450a3e0ce46cb (patch)
tree3cabb7e9d9783802a82ba635e2793d5092d6b242 /nuttx-configs/px4fmu-v2
parent9499e48a524941d955c1b092c7b4e8ebdc1cc807 (diff)
downloadpx4-firmware-fbd5aae8c67ef7695cc31aa3c9d450a3e0ce46cb.tar.gz
px4-firmware-fbd5aae8c67ef7695cc31aa3c9d450a3e0ce46cb.tar.bz2
px4-firmware-fbd5aae8c67ef7695cc31aa3c9d450a3e0ce46cb.zip
Revert "Merged USB ID changes to match bootloader"
This reverts commit 8e599e4a3cf1d89c5ce4d1e8f1020fe047e0a55c.
Diffstat (limited to 'nuttx-configs/px4fmu-v2')
-rw-r--r--nuttx-configs/px4fmu-v2/nsh/defconfig17
1 files changed, 6 insertions, 11 deletions
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