From: Dean Camera <dean@fourwalledcubicle.com>
Date: Mon, 27 Aug 2018 11:09:47 +0000 (+1000)
Subject: Merge pull request #137 from abcminiuser/feature-ccid
X-Git-Tag: LUFA-210130~46
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/737382aeda146ca793be452ac5790e12d1ca16ea?hp=f469eb7745b52029d57636334b2e3f4e511bc968

Merge pull request #137 from abcminiuser/feature-ccid

New class driver: CCID
---

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:
diff --git a/LUFA/DoxygenPages/Donating.txt b/LUFA/DoxygenPages/Donating.txt
index 68228ac94..3e46890d9 100644
--- a/LUFA/DoxygenPages/Donating.txt
+++ b/LUFA/DoxygenPages/Donating.txt
@@ -17,9 +17,6 @@
  *  \ref Page_LicenseInfo for more details (<b>Note: Please do NOT pay this in advance through the donation link below -
  *  contact author for payment details.</b>).
  *
- *  \htmlonly
- *    \image html "http://www.pledgie.com/campaigns/6927.png"
- *  \endhtmlonly
- *  <a href="http://www.lufa-lib.org/donate">Donate to this project via PayPal</a> - Thanks in Advance!
+ *  <a href="http://www.fourwalledcubicle.com">Donate to this project (via PayPal)</a> - Thanks in Advance!
  */