From e870f070dbb82df59218a2537e6152685b475fdb Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Thu, 8 Sep 2011 15:52:05 -0400
Subject: [PATCH] added compile-time definition of sketch PID.  PID is pulled
 from variants/leonardo or the new variants/micro as appropriate.

---
 hardware/arduino/cores/arduino/USBDesc.h      | 13 +--------
 .../arduino/variants/leonardo/pins_arduino.h  |  2 ++
 .../arduino/variants/micro/pins_arduino.h     | 27 +++++++++++++++++++
 3 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 hardware/arduino/variants/micro/pins_arduino.h

diff --git a/hardware/arduino/cores/arduino/USBDesc.h b/hardware/arduino/cores/arduino/USBDesc.h
index 2ad77251b..7d767d170 100644
--- a/hardware/arduino/cores/arduino/USBDesc.h
+++ b/hardware/arduino/cores/arduino/USBDesc.h
@@ -89,19 +89,8 @@
 #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_USB_PID	
 #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
diff --git a/hardware/arduino/variants/leonardo/pins_arduino.h b/hardware/arduino/variants/leonardo/pins_arduino.h
index 79826f0cf..6fc3ea943 100644
--- a/hardware/arduino/variants/leonardo/pins_arduino.h
+++ b/hardware/arduino/variants/leonardo/pins_arduino.h
@@ -27,6 +27,8 @@
 
 #include <avr/pgmspace.h>
 
+#define ARDUINO_MODEL_USB_PID	0x0034
+
 // Map SPI port to 'new' pins D14..D17
 // D14				PB0					RXLED,SS/PCINT0
 // D15				PB1					SCK,PCINT1
diff --git a/hardware/arduino/variants/micro/pins_arduino.h b/hardware/arduino/variants/micro/pins_arduino.h
new file mode 100644
index 000000000..c9f25eb12
--- /dev/null
+++ b/hardware/arduino/variants/micro/pins_arduino.h
@@ -0,0 +1,27 @@
+/*
+  pins_arduino.h - Pin definition functions for Arduino
+  Part of Arduino - http://www.arduino.cc/
+
+  Copyright (c) 2007 David A. Mellis
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+
+  $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
+*/
+
+#include "../leonardo/pins_arduino.h"
+#undef ARDUINO_MODEL_USB_PID
+#define ARDUINO_MODEL_USB_PID	0x0035
\ No newline at end of file