aboutsummaryrefslogtreecommitdiff
path: root/cores
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2011-09-08 11:23:55 -0400
committerZach Eveland <zeveland@blacklabel-development.com>2011-09-08 11:23:55 -0400
commit10c041de808999f3a239da94b7931c46e92c5347 (patch)
tree0803b2d8914d9d3473ca9f5a1841544958805186 /cores
parent08624932028b114638413bdc5fdc895483386cfb (diff)
support compile-time passing of PID to Leonardo/Micro sketches. PID comes from boards.txt - different for Micro and Leonardo
Diffstat (limited to 'cores')
-rw-r--r--cores/arduino/USBDesc.h12
1 files changed, 1 insertions, 11 deletions
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