aboutsummaryrefslogtreecommitdiff
path: root/cores
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2012-04-09 08:06:35 -0400
committerZach Eveland <zeveland@blacklabel-development.com>2012-04-09 08:06:35 -0400
commitec83f55b626f3b9b5da4a0782b8fa81ca72a8933 (patch)
tree9835bd953de97978439b2a6a7ee9a960613c4c5a /cores
parentafedb5a92bac5c7f62a02ba085b4fff2b4f2070a (diff)
sketch USB VID and PID values are passed in from boards.txt at compile time now. changed sketch PIDs to final values. also uncommented Micro section in boards.txt
Diffstat (limited to 'cores')
-rw-r--r--cores/arduino/USBCore.cpp4
-rw-r--r--cores/arduino/USBDesc.h4
2 files changed, 2 insertions, 6 deletions
diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp
index c360d26..d1aeace 100644
--- a/cores/arduino/USBCore.cpp
+++ b/cores/arduino/USBCore.cpp
@@ -51,9 +51,9 @@ const u16 STRING_LANGUAGE[2] = {
const u16 STRING_IPRODUCT[17] = {
(3<<8) | (2+2*16),
-#if USB_PID == USB_PID_LEONARDO
+#if USB_PID == 0x8034
'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
-#elif USB_PID == USB_PID_MICRO
+#elif USB_PID == 0x8035
'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
#endif
};
diff --git a/cores/arduino/USBDesc.h b/cores/arduino/USBDesc.h
index 5cd90ad..900713e 100644
--- a/cores/arduino/USBDesc.h
+++ b/cores/arduino/USBDesc.h
@@ -60,8 +60,4 @@
#define IMANUFACTURER 1
#define IPRODUCT 2
-#define USB_PID_LEONARDO 0x0801
-#define USB_PID_MICRO 0x0035
-#define USB_VID 0x2341 // arduino LLC vid
-#define USB_PID ARDUINO_MODEL_USB_PID