Merge branch 'arduino-micro'

Conflicts:
	avr/boards.txt

2 files changed, 38 insertions, 2 deletions

diff --git a/avr/boards.txt b/avr/boards.txt
index cf834c1..d1226cf 100644
--- a/avr/boards.txt
+++ b/avr/boards.txt
@@ -28,7 +28,7 @@ leonardo.build.pid=0x8036
 leonardo.build.board=AVR_LEONARDO
 leonardo.build.core=arcore
 leonardo.build.variant=arduino:leonardo
-leonardo.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid}
+leonardo.build.extra_flags={build.usb_flags}
 
 ##############################################################
 
@@ -56,6 +56,36 @@ leonardo2.build.pid=0x8036
 leonardo2.build.board=AVR_LEONARDO
 leonardo2.build.core=arcore
 leonardo2.build.variant=arduino:leonardo
-leonardo2.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DIPAD_COMPAT
+leonardo2.build.extra_flags={build.usb_flags} -DIPAD_COMPAT
+
+##############################################################
+
+micro.name=Arduino Micro (arcore)
+micro.upload.tool=avrdude
+micro.upload.protocol=avr109
+micro.upload.maximum_size=28672
+micro.upload.maximum_data_size=2560
+micro.upload.speed=57600
+micro.upload.disable_flushing=true
+micro.upload.use_1200bps_touch=true
+micro.upload.wait_for_upload_port=true
+
+micro.bootloader.tool=avrdude
+micro.bootloader.low_fuses=0xff
+micro.bootloader.high_fuses=0xd8
+micro.bootloader.extended_fuses=0xcb
+micro.bootloader.file=caterina/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=0x8037
+micro.build.usb_product="Arduino Micro"
+micro.build.board=AVR_MICRO
+micro.build.core=arcore
+micro.build.variant=arduino:micro
+micro.build.extra_flags={build.usb_flags}
 
 ##############################################################
diff --git a/avr/platform.txt b/avr/platform.txt
index c4159f7..c1e17ea 100644
--- a/avr/platform.txt
+++ b/avr/platform.txt
@@ -74,3 +74,9 @@ tools.avrdude.bootloader.params.verbose=-v -v -v -v
 tools.avrdude.bootloader.params.quiet=-q -q
 tools.avrdude.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{runtime.ide.path}/hardware/arduino/avr/bootloaders/{bootloader.file}:i" -Ulock:w:{bootloader.lock_bits}:m
 
+
+# USB Default Flags
+# Default blank usb manufacturer will be filled it at compile time
+# - from numeric vendor ID, set to Unknown otherwise
+build.usb_manufacturer=
+build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'