Merge pull request #2 from seifertm/master

Improved support for Arduino mega2560

Makefile

@@ -229,7 +229,7 @@ PID ?= $(shell \
 # Try and guess PORT if it wasn't set previously.
 # Note using shell globs most likely won't work, so try first port.
 ifeq "$(OSNAME)" "Linux"
-ifeq "$(ARDUINO_MODEL)" "uno"
+ifeq ("$(ARDUINO_MODEL)", $(filter "$(ARDUINO_MODEL)", "uno" "mega2560"))
     PORT ?= /dev/ttyACM0
 else
     PORT ?= /dev/ttyUSB0
@@ -245,7 +245,7 @@ endif
 # This makefile part is incomplete. Best set variant explicitly at the top.
 # Default is "standard".
 ifeq ($(ARDUINO_VARIANT),)
-ifeq "$(ARDUINO_MODEL)" "mega"
+ifeq ("$(ARDUINO_MODEL)", $(filter "$(ARDUINO_MODEL)", "mega" "mega2560"))
 ARDUINO_VARIANT ?= $(ARDUINO_DIR)/hardware/arduino/avr/variants/mega
 else
 ifeq "$(ARDUINO_MODEL)" "micro"