From 10c041de808999f3a239da94b7931c46e92c5347 Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Thu, 8 Sep 2011 11:23:55 -0400
Subject: support compile-time passing of PID to Leonardo/Micro sketches.  PID
 comes from boards.txt - different for Micro and Leonardo

---
 cores/arduino/USBDesc.h | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'cores')

diff --git a/cores/arduino/USBDesc.h b/cores/arduino/USBDesc.h
index 2ad7725..49ecf1a 100644
--- a/cores/arduino/USBDesc.h
+++ b/cores/arduino/USBDesc.h
@@ -89,19 +89,9 @@
 #define FAT_FILE_NAME	'F','I','R','M','W','A','R','E','B','I','N'		// 11 chars
 #define MSC_DISK_SERIAL	'0','0','0','0','0','0','0','0','1','7','0','1'	// 12 chars
 
-#ifdef MICROTOUCH
-
-#define USB_VID 0x239A	// Adafruit vid
-#define USB_PID 0x2001	// sorry dave sprach zarathustra
-#define FAT_OEM_NAME	'r','o','s','s','u','m','u','r'					// 8 chars
-#define PRODUCT_NAME	'M','i','c','r','o','t','o','u','c','h'
-
-#else
-
 #define USB_VID 0x2341	// arduino LLC vid
-#define USB_PID 0x0020	// educated guess
+#define USB_PID ARDUINO_MODEL_PID	// passed in at compile time - 0x0034 for Leonardo, 0x0035 for MIcro
 #define FAT_OEM_NAME	'l','e','o','n','a','r','d','o'					// 8 chars
 #define PRODUCT_NAME	'A','r','d','u','i','n','o','l','l','c'			// 10
 
 
-#endif
\ No newline at end of file
-- 
cgit v1.2.3-18-g5258