From: Dean Camera Date: Sun, 8 Jul 2018 08:47:59 +0000 (+1000) Subject: Merge pull request #132 from erikarvstedt/update-pyusb X-Git-Tag: LUFA-210130~48 X-Git-Url: http://git.linex4red.de/pub/lufa.git/commitdiff_plain/1e00627a88e040e0469ce2ca0b8bfb7c535ea7a4?hp=106f0eee17bbe837c9f94bdcf13d28e2952f1aef Merge pull request #132 from erikarvstedt/update-pyusb Update Python USB host examples, to be compatible with PyUSB >= 1.0.0. --- diff --git a/Demos/Device/ClassDriver/GenericHID/HostTestApp/test_generic_hid_libusb.py b/Demos/Device/ClassDriver/GenericHID/HostTestApp/test_generic_hid_libusb.py index 8da8ad767..de700147e 100755 --- a/Demos/Device/ClassDriver/GenericHID/HostTestApp/test_generic_hid_libusb.py +++ b/Demos/Device/ClassDriver/GenericHID/HostTestApp/test_generic_hid_libusb.py @@ -14,7 +14,7 @@ pattern on the target board. Send and received report data is printed to the terminal. - Requires the PyUSB library (http://sourceforge.net/apps/trac/pyusb/). + Requires PyUSB >= 1.0.0 (https://github.com/pyusb/pyusb). """ import sys @@ -71,8 +71,8 @@ def main(): print("Connected to device 0x%04X/0x%04X - %s [%s]" % (hid_device.idVendor, hid_device.idProduct, - usb.util.get_string(hid_device, 256, hid_device.iProduct), - usb.util.get_string(hid_device, 256, hid_device.iManufacturer))) + usb.util.get_string(hid_device, hid_device.iProduct), + usb.util.get_string(hid_device, hid_device.iManufacturer))) p = 0 while (True): diff --git a/Demos/Device/LowLevel/BulkVendor/HostTestApp/test_bulk_vendor.py b/Demos/Device/LowLevel/BulkVendor/HostTestApp/test_bulk_vendor.py index 8e54c7c37..f6f5c5f33 100644 --- a/Demos/Device/LowLevel/BulkVendor/HostTestApp/test_bulk_vendor.py +++ b/Demos/Device/LowLevel/BulkVendor/HostTestApp/test_bulk_vendor.py @@ -11,7 +11,7 @@ receive a continuous stream of packets to/from to the device, to show bidirectional communications. - Requires the pyUSB library (http://sourceforge.net/projects/pyusb/). + Requires PyUSB >= 1.0.0 (https://github.com/pyusb/pyusb). """ import sys @@ -53,8 +53,8 @@ def main(): print("Connected to device 0x%04X/0x%04X - %s [%s]" % (vendor_device.idVendor, vendor_device.idProduct, - usb.util.get_string(vendor_device, 255, vendor_device.iProduct), - usb.util.get_string(vendor_device, 255, vendor_device.iManufacturer))) + usb.util.get_string(vendor_device, vendor_device.iProduct), + usb.util.get_string(vendor_device, vendor_device.iManufacturer))) x = 0 while 1: