Merge remote branch 'upstream/master'

Author: ricklon

hardware/arduino/firmwares/README.txt

@@ -13,5 +13,21 @@ avrdude -p at90usb82 -F -P usb -c avrispmkii -U flash:w:UNO-dfu_and_usbserial_co
 To burn (Mega 2560):
 avrdude -p at90usb82 -F -P usb -c avrispmkii -U flash:w:MEGA-dfu_and_usbserial_combined.hex -U lfuse:w:0xFF:m -U hfuse:w:0xD9:m -U efuse:w:0xF4:m -U lock:w:0x0F:m
 
-Please note that the Arduino VID and PIDs are only for use with official
-Arduino hardware and should not be used on other products.
+
+Note on USB Vendor IDs (VID) and Product IDs (PID): The arduino-usbdfu
+project uses Atmel's VID and MCU-specific PIDs to maintain compatibility
+with their FLIP software.  The source code to the arduino-usbserial
+project includes Atmel's VID and a PID donated by them to LUFA.  This
+PID is used in LUFA's USBtoSerial project, which forms the basis for
+arduino-usbserial.  According to the LUFA documentation, this VID/PID
+combination is:
+
+ "For use in testing of LUFA powered devices during development only,
+ by non-commercial entities. All devices must accept collisions on this
+ VID/PID range (from other in-development LUFA devices) to be resolved
+ by using a unique release number in the Device Descriptor. No devices
+ using this VID/PID combination may be released to the general public."
+
+The production version of the arduino-usbserial firmware uses the
+Arduino VID.  This is only for use with official Arduino hardware and
+should not be used on other products.

hardware/arduino/firmwares/arduino-usbdfu/Descriptors.c

@@ -53,8 +53,8 @@ USB_Descriptor_Device_t DeviceDescriptor =
 
 	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 
-	.VendorID               = 0x03EB,
-	.ProductID              = PRODUCT_ID_CODE,
+	.VendorID               = 0x03EB, // Atmel
+	.ProductID              = PRODUCT_ID_CODE, // MCU-dependent
 	.ReleaseNumber          = 0x0000,
 
 	.ManufacturerStrIndex   = NO_DESCRIPTOR,

hardware/arduino/firmwares/arduino-usbserial/Descriptors.c

@@ -65,9 +65,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
 
 	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 
-	.VendorID               = 0x2341,
+	.VendorID               = 0x03EB, // Atmel
 
-	.ProductID          	= ARDUINO_MODEL_PID,
+	.ProductID          	= 0x204B, // LUFA USB to Serial Demo Application
 	.ReleaseNumber          = 0x0000,
 
 	.ManufacturerStrIndex   = 0x01,

readme.txt

@@ -37,5 +37,6 @@ Gianluca Martino, and David A. Mellis.
 Arduino uses the GNU avr-gcc toolchain, avrdude, avr-libc, and code from
 Processing and Wiring.
 
-Icon Design and Artwork created by Thomas Glaser (envis precisely).
+Icon designed by ToDo: http://www.todo.to.it/
+"About" image created by Thomas Glaser (envis precisely).