From 01d64914c5517f4207c002d931efa1e71fc210d9 Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Fri, 2 Oct 2015 23:25:31 -0700 Subject: 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. --- tools/insert-usb-ids.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'tools/insert-usb-ids.py') diff --git a/tools/insert-usb-ids.py b/tools/insert-usb-ids.py index 4f773b72f6..420db34c5a 100644 --- a/tools/insert-usb-ids.py +++ b/tools/insert-usb-ids.py @@ -8,22 +8,20 @@ import sys import re import string +needed_keys = ('USB_PID_CDC_MSC', 'USB_PID_CDC_HID', 'USB_PID_CDC', 'USB_VID') + def parse_usb_ids(filename): rv = dict() - if filename == 'usbd_desc.c': - for line in open(filename).readlines(): - line = line.rstrip('\r\n') - match = re.match('^#define\s+(\w+)\s+0x([0-9A-Fa-f]+)$', line) - if match: - if match.group(1) == 'USBD_VID': - rv['USB_VID'] = match.group(2) - elif match.group(1) == 'USBD_PID': - rv['USB_PID'] = match.group(2) - if 'USB_VID' in rv and 'USB_PID' in rv: - break - else: - raise Exception("Don't (yet) know how to parse USB IDs from %s" % filename) - for k in ('USB_PID', 'USB_VID'): + for line in open(filename).readlines(): + line = line.rstrip('\r\n') + match = re.match('^#define\s+(\w+)\s+\(0x([0-9A-Fa-f]+)\)$', line) + if match and match.group(1).startswith('USBD_'): + key = match.group(1).replace('USBD', 'USB') + val = match.group(2) + print("key =", key, "val =", val) + if key in needed_keys: + rv[key] = val + for k in needed_keys: if k not in rv: raise Exception("Unable to parse %s from %s" % (k, filename)) return rv -- cgit v1.2.3