TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

stmhal: Fix USB CDC-only mode under Windows.

Browse Source 
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.
This commit is contained in:
Dave Hylands
2015-10-02 23:25:31 -07:00
committed by Damien George
parent 366239b8b9
commit 01d64914c5
6 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/insert-usb-ids.py
View File

@@ -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