Micro I hardly knew ye

hardware/arduino/boards.txt

@@ -167,27 +167,6 @@ leonardo.build.variant=leonardo
 
 ##############################################################
 
-micro.name=Arduino Micro
-micro.upload.protocol=avr109
-micro.upload.maximum_size=28672
-micro.upload.speed=57600
-micro.upload.disable_flushing=true
-micro.bootloader.low_fuses=0xff
-micro.bootloader.high_fuses=0xd8
-micro.bootloader.extended_fuses=0xcb
-micro.bootloader.path=caterina
-micro.bootloader.file=Caterina-Micro.hex
-micro.bootloader.unlock_bits=0x3F
-micro.bootloader.lock_bits=0x2F
-micro.build.mcu=atmega32u4
-micro.build.f_cpu=16000000L
-micro.build.vid=0x2341
-micro.build.pid=0x8035
-micro.build.core=arduino
-micro.build.variant=micro
-
-##############################################################
-
 mini328.name=Arduino Mini w/ ATmega328
 
 mini328.upload.protocol=arduino

hardware/arduino/bootloaders/caterina/Descriptors.c

@@ -195,20 +195,11 @@ const USB_Descriptor_String_t ProductString =
 
 	#if DEVICE_PID == 0x0034
 	.UnicodeString          = L"Arduino Leonardo" 
-	#elif DEVICE_PID == 0x0035
-	.UnicodeString			= L"Arduino Micro   "
-	#else 
+	#else
 	.UnicodeString			= L"USB IO board    "
 	#endif
 };
-/*
-const USB_Descriptor_String_t SerialNumString = 
-{
-	.Header					= {.Size = USB_STRING_LEN(12), .Type = DTYPE_String},
-	
-	.UnicodeString			= L"000000001452"
-};
-*/
+
 const USB_Descriptor_String_t ManufNameString = 
 {
 	.Header					= {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
@@ -252,10 +243,6 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 			{
 				Address = &ProductString;
 				Size    = ProductString.Header.Size;
-//			} else if (DescriptorNumber == DeviceDescriptor.SerialNumStrIndex)
-//			{
-//				Address = &SerialNumString;
-//				Size 	= SerialNumString.Header.Size;
 			} else if (DescriptorNumber == DeviceDescriptor.ManufacturerStrIndex)
 			{
 				Address = &ManufNameString;

hardware/arduino/bootloaders/caterina/Makefile

@@ -54,8 +54,6 @@ VID = 0x2341
 # USB product ID (PID)
 # official Leonardo PID
 #PID = 0x0034
-# official Micro PID
-PID = 0x0035
 
 
 # MCU name

hardware/arduino/cores/arduino/USBCore.cpp

@@ -53,14 +53,18 @@ const u16 STRING_IPRODUCT[17] = {
 	(3<<8) | (2+2*16),
 #if USB_PID == 0x8034	
 	'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
-#elif USB_PID == 0x8035
-	'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
+#else
+	'U','S','B',' ','I','O',' ','B','O','A','R','D',' ',' ',' ',' '
 #endif
 };
 
 const u16 STRING_IMANUFACTURER[12] = {
 	(3<<8) | (2+2*11),
+#if USB_VID == 0x2341
 	'A','r','d','u','i','n','o',' ','L','L','C'
+#else
+	'U','n','k','n','o','w','n',' ',' ',' ',' '
+#endif
 };
 
 #ifdef CDC_ENABLED

hardware/arduino/variants/micro/pins_arduino.h

@@ -1,25 +0,0 @@
-/*
-  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"