summaryrefslogtreecommitdiffstatshomepage
path: root/stmhal/usb.c
diff options
context:
space:
mode:
authorDave Hylands <dhylands@gmail.com>2015-10-02 23:25:31 -0700
committerDamien George <damien.p.george@gmail.com>2015-10-09 00:18:01 +0100
commit01d64914c5517f4207c002d931efa1e71fc210d9 (patch)
tree4f2ad474a609bcda5b0fa6c436c8f7d7611ab9f8 /stmhal/usb.c
parent366239b8b9a2fbea3b6eae8dfc7b4a503d427e4c (diff)
downloadmicropython-01d64914c5517f4207c002d931efa1e71fc210d9.tar.gz
micropython-01d64914c5517f4207c002d931efa1e71fc210d9.zip
stmhal: Fix USB CDC-only mode under Windows.
This fix adds PIDs 9801 and 9802 to the pybcdc.inf file. When in CDC only mode, it presents itself as a Communcations device rather than as a composite device. Presenting as a composite device with only the CDC interface seems to confuse windows. To test and make sure that the correct pybcdc.inf was being used, I used USBDeview from http://www.nirsoft.net/utils/usb_devices_view.html to uninstall any old pyboard drivers (Use Control-F and search for pyboard). I found running USBDeview as administrator worked best. Installing the driver in CDC+MSC mode first is recommended (since the pybcdc.inf file in on the internal flash drive). Then when you switch modes everything seems to work properly. I used https://github.com/dhylands/upy-examples/blob/master/boot_switch.py to easily switch the pyboard between the various USB modes for testing.
Diffstat (limited to 'stmhal/usb.c')
-rw-r--r--stmhal/usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/stmhal/usb.c b/stmhal/usb.c
index 085eae1299..cedd3525c7 100644
--- a/stmhal/usb.c
+++ b/stmhal/usb.c
@@ -98,7 +98,7 @@ bool pyb_usb_dev_init(uint16_t vid, uint16_t pid, usb_device_mode_t mode, USBD_H
#ifdef USE_DEVICE_MODE
if (!(pyb_usb_flags & PYB_USB_FLAG_DEV_ENABLED)) {
// only init USB once in the device's power-lifetime
- USBD_SetVIDPIDRelease(vid, pid, 0x0200);
+ USBD_SetVIDPIDRelease(vid, pid, 0x0200, mode == USBD_MODE_CDC);
if (USBD_SelectMode(mode, hid_info) != 0) {
return false;
}