build: fix make scripts

3 files changed, 1345 insertions, 242 deletions

diff --git a/make-scripts/Arduino.mk b/make-scripts/Arduino.mk
index f25c577..ff8a4fd 100644
--- a/make-scripts/Arduino.mk
+++ b/make-scripts/Arduino.mk
@@ -1,5 +1,7 @@
+########################################################################
 #
 # Makefile for compiling Arduino sketches from command line
+# System part (i.e. project independent)
 #
 # Copyright (C) 2012 Sudar <http://sudarmuthu.com>, based on
 # M J Oldfield work: https://github.com/mjoldfield/Arduino-Makefile
@@ -19,6 +21,220 @@
 #
 # Current version: 1.6.0
 #
+# Refer to HISTORY.md file for complete history of changes
+#
+########################################################################
+#
+# PATHS YOU NEED TO SET UP
+#
+# We need to worry about three different sorts of files:
+#
+# 1. The directory where the *.mk files are stored
+#    => ARDMK_DIR
+#
+# 2. Things which are always in the Arduino distribution e.g.
+#    boards.txt, libraries, etc.
+#    => ARDUINO_DIR
+#
+# 3. Things which might be bundled with the Arduino distribution, but
+#    might come from the system. Most of the toolchain is like this:
+#    on Linux it is supplied by the system.
+#    => AVR_TOOLS_DIR
+#
+# Having set these three variables, we can work out the rest assuming
+# that things are canonically arranged beneath the directories defined
+# above.
+#
+# On the Mac with IDE 1.0 you might want to set:
+#
+#   ARDUINO_DIR   = /Applications/Arduino.app/Contents/Resources/Java
+#   ARDMK_DIR     = /usr/local
+#
+# On the Mac with IDE 1.5+ you might want to set:
+#
+#   ARDUINO_DIR   = /Applications/Arduino.app/Contents/Java
+#   ARDMK_DIR     = /usr/local
+#
+# On Linux, you might prefer:
+#
+#   ARDUINO_DIR   = /usr/share/arduino
+#   ARDMK_DIR     = /usr/share/arduino
+#   AVR_TOOLS_DIR = /usr
+#
+# On Windows declare this environmental variables using the windows
+# configuration options or Cygwin .bashrc. Control Panel > System > Advanced system settings
+# The paths must use Unix style forward slash and not have any spaces 
+# or escape charactors. One must use a symbolic link if the path does
+# contain spaces.
+#
+# This are just examples, you have to adapt this variables accordingly to
+# your system. Note the difference between ARDMK_DIR, which can use /cygdrive/
+# and USER_LIB_PATH, which cannnot due to invoking with the build tools.
+# It is best practice to avoid cygdrive all together.
+#
+#   ARDUINO_DIR   = C:/Arduino
+#   AVR_TOOLS_DIR = C:/Arduino/hardware/tools/avr
+#   ARDMK_DIR     = /cygdrive/c/Users/"YourUser"/Arduino-Makefile
+#
+# On Windows it is highly recommended that you create a symbolic link directory
+# for avoiding using the normal directories name of windows such as
+# C:\Program Files (x86)\Arduino
+# For this use the command mklink on the console.
+#
+#
+# You can either set these up in the Makefile, or put them in your
+# environment e.g. in your .bashrc
+#
+# If you don't specify these, we can try to guess, but that might not work
+# or work the way you want it to.
+#
+# If you'd rather not see the configuration output, define ARDUINO_QUIET.
+#
+########################################################################
+#
+# DEPENDENCIES
+#
+#  to reset a board the (python)  pySerial program is used.
+#  please install it prior to continue.
+#
+########################################################################
+#
+# STANDARD ARDUINO WORKFLOW
+#
+# Given a normal sketch directory, all you need to do is to create
+# a small Makefile which defines a few things, and then includes this one.
+#
+# For example:
+#
+#       ARDUINO_LIBS = Ethernet SPI
+#       BOARD_TAG    = uno
+#       MONITOR_PORT = /dev/cu.usb*
+#
+#       include /usr/share/arduino/Arduino.mk
+#
+# Hopefully these will be self-explanatory but in case they're not:
+#
+#    ARDUINO_LIBS - A list of any libraries used by the sketch (we
+#                   assume these are in $(ARDUINO_DIR)/hardware/libraries
+#                   or your sketchbook's libraries directory)
+#
+#    MONITOR_PORT - The port where the Arduino can be found (only needed
+#                   when uploading)
+#
+#    BOARD_TAG    - The tag for the board e.g. uno or mega
+#                   'make show_boards' shows a list
+#
+# If you have your additional libraries relative to your source, rather
+# than in your "sketchbook", also set USER_LIB_PATH, like this example:
+#
+#        USER_LIB_PATH := $(realpath ../../libraries)
+#
+# If you've added the Arduino-Makefile repository to your git repo as a
+# submodule (or other similar arrangement), you might have lines like this
+# in your Makefile:
+#
+#        ARDMK_DIR := $(realpath ../../tools/Arduino-Makefile)
+#        include $(ARDMK_DIR)/Arduino.mk
+#
+# In any case, once this file has been created the typical workflow is just
+#
+#   $ make upload
+#
+# All of the object files are created in the build-{BOARD_TAG} subdirectory
+# All sources should be in the current directory and can include:
+#  - at most one .pde or .ino file which will be treated as C++ after
+#    the standard Arduino header and footer have been affixed.
+#  - any number of .c, .cpp, .s and .h files
+#
+# Included libraries are built in the build-{BOARD_TAG}/libs subdirectory.
+#
+# Besides make upload, there are a couple of other targets that are available.
+# Do make help to get the complete list of targets and their description
+#
+########################################################################
+#
+# SERIAL MONITOR
+#
+# The serial monitor just invokes the GNU screen program with suitable
+# options. For more information see screen (1) and search for
+# 'character special device'.
+#
+# The really useful thing to know is that ^A-k gets you out!
+#
+# The fairly useful thing to know is that you can bind another key to
+# escape too, by creating $HOME{.screenrc} containing e.g.
+#
+#    bindkey ^C kill
+#
+# If you want to change the baudrate, just set MONITOR_BAUDRATE. If you
+# don't set it, it tries to read from the sketch. If it couldn't read
+# from the sketch, then it defaults to 9600 baud.
+#
+########################################################################
+#
+# ARDUINO WITH ISP
+#
+# You need to specify some details of your ISP programmer and might
+# also need to specify the fuse values:
+#
+#     ISP_PROG	   = stk500v2
+#     ISP_PORT     = /dev/ttyACM0
+#
+# You might also need to set the fuse bits, but typically they'll be
+# read from boards.txt, based on the BOARD_TAG variable:
+#
+#     ISP_LOCK_FUSE_PRE  = 0x3f
+#     ISP_LOCK_FUSE_POST = 0xcf
+#     ISP_HIGH_FUSE      = 0xdf
+#     ISP_LOW_FUSE       = 0xff
+#     ISP_EXT_FUSE       = 0x01
+#
+# You can specify to also upload the EEPROM file:
+#     ISP_EEPROM   = 1
+#
+# I think the fuses here are fine for uploading to the ATmega168
+# without bootloader.
+#
+# To actually do this upload use the ispload target:
+#
+#    make ispload
+#
+#
+########################################################################
+#
+# ALTERNATIVE CORES
+#
+# To use alternative cores for platforms such as ATtiny, you need to
+# specify a few more variables, depending on the core in use.
+#
+# The HLT (attiny-master) core can be used just by specifying
+# ALTERNATE_CORE, assuming your core is in your ~/sketchbook/hardware
+# directory. For example:
+#
+# ISP_PORT          = /dev/ttyACM0
+# BOARD_TAG         = attiny85
+# ALTERNATE_CORE    = attiny-master
+#
+# To use the more complex arduino-tiny and TinyCore2 cores, you must
+# also set ARDUINO_CORE_PATH and ARDUINO_VAR_PATH to the core
+# directory, as these cores essentially replace the main Arduino core.
+# For example:
+#
+# ISP_PORT          = /dev/ttyACM0
+# BOARD_TAG         = attiny85at8
+# ALTERNATE_CORE    = arduino-tiny
+# ARDUINO_VAR_PATH  = ~/sketchbook/hardware/arduino-tiny/cores/tiny
+# ARDUINO_CORE_PATH = ~/sketchbook/hardware/arduino-tiny/cores/tiny
+#
+# or....
+#
+# ISP_PORT          = /dev/ttyACM0
+# BOARD_TAG         = attiny861at8
+# ALTERNATE_CORE    = tiny2
+# ARDUINO_VAR_PATH  = ~/sketchbook/hardware/tiny2/cores/tiny
+# ARDUINO_CORE_PATH = ~/sketchbook/hardware/tiny2/cores/tiny
+#
+########################################################################
 
 arduino_output =
 # When output is not suppressed and we're in the top-level makefile,
@@ -35,176 +251,635 @@ ifeq ($(ARDUINO_QUIET),0)
     endif
 endif
 
-include $(ARDMK_DIR)/Common.mk
+########################################################################
+# Makefile distribution path
 
-ifeq ($(CURRENT_OS), WINDOWS)
-    echo $(error Error: Windows is not supported! Please upgrade to a better operating system and try again)
+ifndef ARDMK_DIR
+    # presume it's the same path to our own file
+    ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST)))))
+else
+    # show_config_variable macro is defined in Common.mk file and is not available yet.
+    # Let's define a variable to know that user specified ARDMK_DIR
+    ARDMK_DIR_MSG = USER
 endif
 
-$(call show_config_variable,ARDMK_DIR,[USER])
+# include Common.mk now we know where it is
+ifndef COMMON_INCLUDED
+    include $(ARDMK_DIR)/Common.mk
+endif
 
-$(call show_config_variable,TARGET,[DEFAULT])
+# show_config_variable macro is available now. So let's print config details for ARDMK_DIR
+ifndef ARDMK_DIR_MSG
+    $(call show_config_variable,ARDMK_DIR,[COMPUTED],(relative to $(notdir $(lastword $(MAKEFILE_LIST)))))
+else
+    $(call show_config_variable,ARDMK_DIR,[USER])
+endif
 
-$(call show_config_variable,ARDUINO_VERSION,[USER])
-$(call show_config_variable,ARDUINO_VERSION_SHORT,[USER])
+########################################################################
+# Default TARGET to pwd (ex Daniele Vergini)
 
-$(call show_config_variable,ARCHITECTURE,[USER])
-$(call show_config_variable,ARDMK_VENDOR,[DEFAULT])
+ifndef TARGET
+    space :=
+    space +=
+    TARGET = $(notdir $(subst $(space),_,$(CURDIR)))
+endif
 
-$(call show_config_variable,ARDUINO_VAR_PATH,[COMPUTED],(from ARDUINO_DIR))
-$(call show_config_variable,BOARDS_TXT,[COMPUTED],(from ARDUINO_DIR))
+########################################################################
+# Arduino version number
+
+ifndef ARDUINO_VERSION
+    # Remove all the decimals, remove anything before/including ":", remove anything after/including "+" and finally grab the last 5 bytes.
+    # Works for 1.0 and 1.0.1 and 1.6.10 and debian-style 2:1.0.5+dfsg2-4
+    VERSION_FILE := $(ARDUINO_DIR)/lib/version.txt
+    AUTO_ARDUINO_VERSION := $(shell [ -e $(VERSION_FILE) ] && cat $(VERSION_FILE) | sed -e 's/^[0-9]://g' -e 's/[.]//g' -e 's/\+.*//g' | head -c5)
+    ifdef AUTO_ARDUINO_VERSION
+        ARDUINO_VERSION = $(AUTO_ARDUINO_VERSION)
+        $(call show_config_variable,ARDUINO_VERSION,[AUTODETECTED])
+    else
+        ARDUINO_VERSION = 100
+        $(call show_config_variable,ARDUINO_VERSION,[DEFAULT])
+    endif
+else
+    $(call show_config_variable,ARDUINO_VERSION,[USER])
+endif
+
+########################################################################
+# 1.5.x architecture - avr or sam for arduino vendor
+ifndef ARCHITECTURE
+    ifeq ($(shell expr $(ARDUINO_VERSION) '>' 150), 1)
+        # default to avr for 1.5
+        ARCHITECTURE = avr
+        ARDUINO_ARCH_FLAG = -DARDUINO_ARCH_AVR
+    else
+        # unset for 1.0
+        ARCHITECTURE =
+    endif
+    $(call show_config_variable,ARCHITECTURE,[DEFAULT])
+else
+    $(call show_config_variable,ARCHITECTURE,[USER])
 
-ifdef BUNDLED_AVR_TOOLS_DIR
-	AVR_TOOLS_DIR     = $(BUNDLED_AVR_TOOLS_DIR)
-	$(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution))
+    #avoid using shell for known architectures
+    ifeq ($(ARCHITECTURE),avr)
+        ARDUINO_ARCH_FLAG = -DARDUINO_ARCH_AVR
+    else
+        ARDUINO_ARCH_FLAG = -DARDUINO_ARCH_$(shell echo $(ARCHITECTURE) | tr '[:lower:]' '[:upper:]')
+    endif
+endif
 
-	AVRDUDE = $(AVR_TOOLS_DIR)/bin/avrdude
-	AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf
+########################################################################
+# 1.5.x vendor - defaults to arduino
+ifndef ARDMK_VENDOR
+    ARCH_LINUX := $(shell grep "Arch Linux" /etc/os-release 2>/dev/null)
+    ifdef ARCH_LINUX
+        ARDMK_VENDOR = archlinux-arduino
+    else
+        ARDMK_VENDOR = arduino
+    endif
+    $(call show_config_variable,ARDMK_VENDOR,[DEFAULT])
 else
-	SYSTEMPATH_AVR_TOOLS_DIR := $(call dir_if_exists,$(abspath $(dir $(shell which $(CC_NAME)))/..))
-	ifdef SYSTEMPATH_AVR_TOOLS_DIR
-		AVR_TOOLS_DIR = $(SYSTEMPATH_AVR_TOOLS_DIR)
-        $(call show_config_variable,AVR_TOOLS_DIR,[AUTODETECTED],(found in $$PATH))
-	else
-		# One last attempt using $(TOOL_PREFIX)-gcc in case using arm
-		SYSTEMPATH_AVR_TOOLS_DIR := $(call dir_if_exists,$(abspath $(dir $(shell which $($(TOOL_PREFIX)-gcc)))/..))
-		ifdef SYSTEMPATH_AVR_TOOLS_DIR
-			AVR_TOOLS_DIR = $(SYSTEMPATH_AVR_TOOLS_DIR)
-			$(call show_config_variable,AVR_TOOLS_DIR,[AUTODETECTED],(found in $$PATH))
-		else
-			echo $(error No AVR tools directory found)
-		endif
-	endif
+    $(call show_config_variable,ARDMK_VENDOR,[USER])
 endif
 
-$(call show_config_variable,ARDUINO_LIB_PATH,[COMPUTED],(from ARDUINO_DIR))
-$(call show_config_variable,ARDUINO_PLATFORM_LIB_PATH,[COMPUTED],(from ARDUINO_DIR))
-$(call show_config_variable,PROJ_LIBS_PATH,[DEFAULT])
+########################################################################
+# Arduino Sketchbook folder
+
+ifndef ARDUINO_SKETCHBOOK
+    ifndef ARDUINO_PREFERENCES_PATH
+        ifeq ($(shell expr $(ARDUINO_VERSION) '>' 150), 1)
+            AUTO_ARDUINO_PREFERENCES := $(firstword \
+                $(call dir_if_exists,$(HOME)/.arduino15/preferences.txt) \
+                $(call dir_if_exists,$(HOME)/Library/Arduino15/preferences.txt) )
+        else
+            AUTO_ARDUINO_PREFERENCES := $(firstword \
+                $(call dir_if_exists,$(HOME)/.arduino/preferences.txt) \
+                $(call dir_if_exists,$(HOME)/Library/Arduino/preferences.txt) )
+        endif
 
-$(call show_config_variable,PRE_BUILD_HOOK,[DEFAULT])
+        ifdef AUTO_ARDUINO_PREFERENCES
+           ARDUINO_PREFERENCES_PATH = $(AUTO_ARDUINO_PREFERENCES)
+           $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[AUTODETECTED])
+        endif
+
+    else
+        $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[USER])
+    endif
+
+    ifneq ($(ARDUINO_PREFERENCES_PATH),)
+        ARDUINO_SKETCHBOOK := $(shell grep --max-count=1 --regexp='sketchbook.path=' \
+                                          $(ARDUINO_PREFERENCES_PATH) | \
+                                     sed -e 's/sketchbook.path=//' )
+    endif
+
+    ifneq ($(ARDUINO_SKETCHBOOK),)
+        $(call show_config_variable,ARDUINO_SKETCHBOOK,[AUTODETECTED],(from arduino preferences file))
+    else
+        ifeq ($(CURRENT_OS), WINDOWS)
+            ARDUINO_SKETCHBOOK := $(firstword \
+            $(call dir_if_exists,$(USERPROFILE)/sketchbook) \
+            $(call dir_if_exists,$(USERPROFILE)/Documents/Arduino) )
+        else
+            ARDUINO_SKETCHBOOK := $(firstword \
+              $(call dir_if_exists,$(HOME)/sketchbook) \
+              $(call dir_if_exists,$(HOME)/Documents/Arduino) )
+        endif
+        $(call show_config_variable,ARDUINO_SKETCHBOOK,[DEFAULT])
+    endif
+else
+    $(call show_config_variable,ARDUINO_SKETCHBOOK,[USER])
+endif
 
 ########################################################################
-# boards.txt parsing
+# Arduino and system paths
 
-ifdef BOARD_SUB
-    BOARD_SUB := $(strip $(BOARD_SUB))
-    $(call show_config_variable,BOARD_SUB,[USER])
+# Third party hardware and core like ATtiny or ATmega 16
+ifdef ALTERNATE_CORE
+    $(call show_config_variable,ALTERNATE_CORE,[USER])
+
+    ifndef ALTERNATE_CORE_PATH
+        ALTERNATE_CORE_PATH = $(ARDUINO_SKETCHBOOK)/hardware/$(ALTERNATE_CORE)/$(ARCHITECTURE)
+    endif
 endif
 
-BOARD_TAG := $(strip $(BOARD_TAG))
-$(call show_config_variable,BOARD_TAG,[USER])
+ifdef ALTERNATE_CORE_PATH
+
+    ifdef ALTERNATE_CORE
+        $(call show_config_variable,ALTERNATE_CORE_PATH,[COMPUTED], (from ARDUINO_SKETCHBOOK and ALTERNATE_CORE))
+    else
+        $(call show_config_variable,ALTERNATE_CORE_PATH,[USER])
+    endif
+
+    ifndef ARDUINO_VAR_PATH
+        ARDUINO_VAR_PATH  = $(ALTERNATE_CORE_PATH)/variants
+        $(call show_config_variable,ARDUINO_VAR_PATH,[COMPUTED],(from ALTERNATE_CORE_PATH))
+    endif
+
+    ifndef BOARDS_TXT
+        BOARDS_TXT  = $(ALTERNATE_CORE_PATH)/boards.txt
+        $(call show_config_variable,BOARDS_TXT,[COMPUTED],(from ALTERNATE_CORE_PATH))
+    endif
+
+else
+
+    ifndef ARDUINO_VAR_PATH
+        ARDUINO_VAR_PATH  = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/variants
+        $(call show_config_variable,ARDUINO_VAR_PATH,[COMPUTED],(from ARDUINO_DIR))
+    else
+        $(call show_config_variable,ARDUINO_VAR_PATH,[USER])
+    endif
+
+    ifndef BOARDS_TXT
+        BOARDS_TXT  = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/boards.txt
+        $(call show_config_variable,BOARDS_TXT,[COMPUTED],(from ARDUINO_DIR))
+    else
+        $(call show_config_variable,BOARDS_TXT,[USER])
+    endif
 
-ifdef BOARD_CLOCK
-    BOARD_CLOCK := $(strip $(BOARD_CLOCK))
-    $(call show_config_variable,BOARD_CLOCK,[USER])
 endif
 
-# Select a core from the 'cores' directory
-CORE = $(call PARSE_BOARD,$(BOARD_TAG),build.core)
-$(call show_config_variable,CORE,[COMPUTED],(from build.core))
+ifeq (,$(wildcard $(BOARDS_TXT)))
+    $(error Currently BOARDS_TXT='$(BOARDS_TXT)', which is not an existing file or an invalid filename.)
+endif
 
-# Which variant? This affects the include path
-VARIANT := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).build.variant)
-ifndef VARIANT
-    VARIANT := $(call PARSE_BOARD,$(BOARD_TAG),build.variant)
+ifndef TOOL_PREFIX
+    TOOL_PREFIX = avr
 endif
-$(call show_config_variable,VARIANT,[COMPUTED],(from build.variant))
 
-BOARD := $(call PARSE_BOARD,$(BOARD_TAG),build.board)
-ifndef BOARD
-    BOARD := $(shell echo $(ARCHITECTURE)_$(BOARD_TAG) | tr '[:lower:]' '[:upper:]')
+ifndef CC_NAME
+    CC_NAME := $(call PARSE_BOARD,$(BOARD_TAG),build.command.gcc)
+    ifndef CC_NAME
+        CC_NAME := $(TOOL_PREFIX)-gcc
+    else
+        $(call show_config_variable,CC_NAME,[COMPUTED])
+    endif
 endif
-$(call show_config_variable,BOARD,[COMPUTED],(from build.board))
 
-# see if we are a caterina device like leonardo or micro
-CATERINA := $(findstring caterina,$(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).bootloader.file))
-ifndef CATERINA
-    CATERINA := $(findstring caterina,$(call PARSE_BOARD,$(BOARD_TAG),bootloader.file))
+ifndef CXX_NAME
+    CXX_NAME := $(call PARSE_BOARD,$(BOARD_TAG),build.command.g++)
+    ifndef CXX_NAME
+        CXX_NAME := $(TOOL_PREFIX)-g++
+    else
+        $(call show_config_variable,CXX_NAME,[COMPUTED])
+    endif
 endif
 
-# processor stuff
-MCU := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).build.mcu)
-ifndef MCU
-    MCU := $(call PARSE_BOARD,$(BOARD_TAG),build.mcu)
+ifndef AS_NAME
+    AS_NAME := $(call PARSE_BOARD,$(BOARD_TAG),build.command.as)
+    ifndef AS_NAME
+        AS_NAME := $(TOOL_PREFIX)-as
+    else
+        $(call show_config_variable,AS_NAME,[COMPUTED])
+    endif
 endif
 
-ifdef BOARD_CLOCK
-    F_CPU := $(call PARSE_BOARD,$(BOARD_TAG),menu.(speed|clock).$(BOARD_CLOCK).build.f_cpu)
+ifndef OBJCOPY_NAME
+    OBJCOPY_NAME := $(call PARSE_BOARD,$(BOARD_TAG),build.command.objcopy)
+    ifndef OBJCOPY_NAME
+        OBJCOPY_NAME := $(TOOL_PREFIX)-objcopy
+    else
+        $(call show_config_variable,OBJCOPY_NAME,[COMPUTED])
+    endif
 endif
-ifndef F_CPU
-    F_CPU := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).build.f_cpu)
+
+ifndef OBJDUMP_NAME
+    OBJDUMP_NAME := $(call PARSE_BOARD,$(BOARD_TAG),build.command.objdump)
+    ifndef OBJDUMP_NAME
+        OBJDUMP_NAME := $(TOOL_PREFIX)-objdump
+    else
+        $(call show_config_variable,OBJDUMP_NAME,[COMPUTED])
+    endif
 endif
-ifndef F_CPU
-    F_CPU := $(call PARSE_BOARD,$(BOARD_TAG),build.f_cpu)
+
+ifndef AR_NAME
+    AR_NAME := $(call PARSE_BOARD,$(BOARD_TAG),build.command.ar)
+    ifndef AR_NAME
+        AR_NAME := $(TOOL_PREFIX)-ar
+    else
+        $(call show_config_variable,AR_NAME,[COMPUTED])
+    endif
 endif
 
-# USB IDs for the caterina devices like leonardo or micro
-USB_VID = $(call PARSE_BOARD,$(BOARD_TAG),build.vid)
+ifndef SIZE_NAME
+    SIZE_NAME := $(call PARSE_BOARD,$(BOARD_TAG),build.command.size)
+    ifndef SIZE_NAME
+        SIZE_NAME := $(TOOL_PREFIX)-size
+    else
+        $(call show_config_variable,SIZE_NAME,[COMPUTED])
+    endif
+endif
 
-# coping with 2-3 methods sparkfun use for usb.pid
-USB_PID := $(call PARSE_BOARD,$(BOARD_TAG),build.pid)
-ifndef USB_PID
-    USB_PID := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).build.pid)
+ifndef NM_NAME
+    NM_NAME := $(call PARSE_BOARD,$(BOARD_TAG),build.command.nm)
+    ifndef NM_NAME
+        NM_NAME := $(TOOL_PREFIX)-nm
+    else
+        $(call show_config_variable,NM_NAME,[COMPUTED])
+    endif
 endif
 
-USB_PRODUCT := $(call PARSE_BOARD,$(BOARD_TAG),build.usb_product)
-ifdef USB_PRODUCT
-    $(call show_config_variable,USB_PRODUCT,[COMPUTED])
+ifndef AVR_TOOLS_DIR
+
+    BUNDLED_AVR_TOOLS_DIR := $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr)
+
+    ifdef BUNDLED_AVR_TOOLS_DIR
+        AVR_TOOLS_DIR     = $(BUNDLED_AVR_TOOLS_DIR)
+        $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution))
+
+        # In Linux distribution of Arduino, the path to avrdude and avrdude.conf are different
+        # More details at https://github.com/sudar/Arduino-Makefile/issues/48 and
+        # https://groups.google.com/a/arduino.cc/d/msg/developers/D_m97jGr8Xs/uQTt28KO_8oJ
+        ifeq ($(CURRENT_OS),LINUX)
+
+            ifndef AVRDUDE
+                ifeq ($(shell expr $(ARDUINO_VERSION) '>' 157), 1)
+                    # 1.5.8 has different location than all prior versions!
+                    AVRDUDE = $(AVR_TOOLS_DIR)/bin/avrdude
+                else
+                    AVRDUDE = $(AVR_TOOLS_DIR)/../avrdude
+                endif
+            endif
+
+            ifndef AVRDUDE_CONF
+                ifeq ($(shell expr $(ARDUINO_VERSION) '>' 157), 1)
+                    AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf
+                else
+                    AVRDUDE_CONF = $(AVR_TOOLS_DIR)/../avrdude.conf
+                endif
+            endif
+
+        else
+
+            ifndef AVRDUDE_CONF
+                AVRDUDE_CONF  = $(AVR_TOOLS_DIR)/etc/avrdude.conf
+            endif
+
+        endif
+
+    else
+
+        SYSTEMPATH_AVR_TOOLS_DIR := $(call dir_if_exists,$(abspath $(dir $(shell which $(CC_NAME)))/..))
+        ifdef SYSTEMPATH_AVR_TOOLS_DIR
+            AVR_TOOLS_DIR = $(SYSTEMPATH_AVR_TOOLS_DIR)
+            $(call show_config_variable,AVR_TOOLS_DIR,[AUTODETECTED],(found in $$PATH))
+        else
+            # One last attempt using $(TOOL_PREFIX)-gcc in case using arm
+            SYSTEMPATH_AVR_TOOLS_DIR := $(call dir_if_exists,$(abspath $(dir $(shell which $($(TOOL_PREFIX)-gcc)))/..))
+            ifdef SYSTEMPATH_AVR_TOOLS_DIR
+                AVR_TOOLS_DIR = $(SYSTEMPATH_AVR_TOOLS_DIR)
+                $(call show_config_variable,AVR_TOOLS_DIR,[AUTODETECTED],(found in $$PATH))
+            else
+                echo $(error No AVR tools directory found)
+            endif
+        endif # SYSTEMPATH_AVR_TOOLS_DIR
+
+    endif # BUNDLED_AVR_TOOLS_DIR
+
+else
+    $(call show_config_variable,AVR_TOOLS_DIR,[USER])
+
+    # ensure we can still find avrdude.conf
+    ifndef AVRDUDE_CONF
+        ifeq ($(shell expr $(ARDUINO_VERSION) '>' 157), 1)
+            AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf
+        else
+            AVRDUDE_CONF = $(AVR_TOOLS_DIR)/../avrdude.conf
+        endif
+    endif
+
+endif #ndef AVR_TOOLS_DIR
+
+ifndef TOOLS_PATH
+    TOOLS_PATH    = $(AVR_TOOLS_DIR)/bin
+endif
+
+ifndef ARDUINO_LIB_PATH
+    ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries
+    $(call show_config_variable,ARDUINO_LIB_PATH,[COMPUTED],(from ARDUINO_DIR))
+else
+    $(call show_config_variable,ARDUINO_LIB_PATH,[USER])
 endif
 
-USB_MANUFACTURER := $(call PARSE_BOARD,$(BOARD_TAG),build.usb_manufacturer)
-ifndef USB_MANUFACTURER
-    USB_MANUFACTURER = "Unknown"
+# 1.5.x platform dependent libs path
+ifndef ARDUINO_PLATFORM_LIB_PATH
+    ifeq ($(shell expr $(ARDUINO_VERSION) '>' 150), 1)
+        # only for 1.5
+        ARDUINO_PLATFORM_LIB_PATH = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/libraries
+        $(call show_config_variable,ARDUINO_PLATFORM_LIB_PATH,[COMPUTED],(from ARDUINO_DIR))
+    endif
 else
-    $(call show_config_variable,USB_MANUFACTURER,[COMPUTED])
+    $(call show_config_variable,ARDUINO_PLATFORM_LIB_PATH,[USER])
 endif
 
-# normal programming info
-AVRDUDE_ARD_PROGRAMMER := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).upload.protocol)
-ifndef AVRDUDE_ARD_PROGRAMMER
-    AVRDUDE_ARD_PROGRAMMER := $(call PARSE_BOARD,$(BOARD_TAG),upload.protocol)
+########################################################################
+# Miscellaneous
+
+ifndef USER_LIB_PATH
+    USER_LIB_PATH = $(ARDUINO_SKETCHBOOK)/libraries
+    $(call show_config_variable,USER_LIB_PATH,[DEFAULT],(in user sketchbook))
+else
+    $(call show_config_variable,USER_LIB_PATH,[USER])
 endif
 
-AVRDUDE_ARD_BAUDRATE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).upload.speed)
-ifndef AVRDUDE_ARD_BAUDRATE
-    AVRDUDE_ARD_BAUDRATE := $(call PARSE_BOARD,$(BOARD_TAG),upload.speed)
+ifndef PRE_BUILD_HOOK
+    PRE_BUILD_HOOK = pre-build-hook.sh
+    $(call show_config_variable,PRE_BUILD_HOOK,[DEFAULT])
+else
+    $(call show_config_variable,PRE_BUILD_HOOK,[USER])
 endif
 
-BOOTLOADER_PATH = $(call PARSE_BOARD,$(BOARD_TAG),bootloader.path)
+########################################################################
+# boards.txt parsing
+
+ifdef BOARD_SUB
+    BOARD_SUB := $(strip $(BOARD_SUB))
+    $(call show_config_variable,BOARD_SUB,[USER])
+endif
 
-BOOTLOADER_FILE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).bootloader.file)
-ifndef BOOTLOADER_FILE
-    BOOTLOADER_FILE := $(call PARSE_BOARD,$(BOARD_TAG),bootloader.file)
+ifndef BOARD_TAG
+    BOARD_TAG   = uno
+    $(call show_config_variable,BOARD_TAG,[DEFAULT])
+else
+    # Strip the board tag of any extra whitespace, since it was causing the makefile to fail
+    # https://github.com/sudar/Arduino-Makefile/issues/57
+    BOARD_TAG := $(strip $(BOARD_TAG))
+    $(call show_config_variable,BOARD_TAG,[USER])
 endif
 
-HEX_MAXIMUM_SIZE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).upload.maximum_size)
-ifndef HEX_MAXIMUM_SIZE
-    HEX_MAXIMUM_SIZE := $(call PARSE_BOARD,$(BOARD_TAG),upload.maximum_size)
+ifdef BOARD_CLOCK
+    BOARD_CLOCK := $(strip $(BOARD_CLOCK))
+    $(call show_config_variable,BOARD_CLOCK,[USER])
 endif
 
-$(call show_config_variable,OBJDIR,[COMPUTED],(from BOARD_TAG))
+# If NO_CORE is set, then we don't have to parse boards.txt file
+# But the user might have to define MCU, F_CPU etc
+ifeq ($(strip $(NO_CORE)),)
+
+    # Select a core from the 'cores' directory. Two main values: 'arduino' or
+    # 'robot', but can also hold 'tiny', for example, if using
+    # https://code.google.com/p/arduino-tiny alternate core.
+    ifndef CORE
+        CORE = $(call PARSE_BOARD,$(BOARD_TAG),build.core)
+        $(call show_config_variable,CORE,[COMPUTED],(from build.core))
+    else
+        $(call show_config_variable,CORE,[USER])
+    endif
+
+    # Which variant ? This affects the include path
+    ifndef VARIANT
+        VARIANT := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).build.variant)
+        ifndef VARIANT
+            VARIANT := $(call PARSE_BOARD,$(BOARD_TAG),build.variant)
+        endif
+        $(call show_config_variable,VARIANT,[COMPUTED],(from build.variant))
+    else
+        $(call show_config_variable,VARIANT,[USER])
+    endif
+
+    ifndef BOARD
+	BOARD := $(call PARSE_BOARD,$(BOARD_TAG),build.board)
+        ifndef BOARD
+            BOARD := $(shell echo $(ARCHITECTURE)_$(BOARD_TAG) | tr '[:lower:]' '[:upper:]')
+        endif
+        $(call show_config_variable,BOARD,[COMPUTED],(from build.board))
+    else
+        $(call show_config_variable,BOARD,[USER])
+    endif
+
+    # see if we are a caterina device like leonardo or micro
+    CATERINA := $(findstring caterina,$(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).bootloader.file))
+    ifndef CATERINA
+        # 1.5+ method if not a submenu
+        CATERINA := $(findstring caterina,$(call PARSE_BOARD,$(BOARD_TAG),bootloader.file))
+    endif
+    ifndef CATERINA
+        # 1.0 method uses deprecated bootloader.path
+        CATERINA := $(findstring caterina,$(call PARSE_BOARD,$(BOARD_TAG),bootloader.path))
+    endif
+
+    # processor stuff
+    ifndef MCU
+        MCU := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).build.mcu)
+        ifndef MCU
+            MCU := $(call PARSE_BOARD,$(BOARD_TAG),build.mcu)
+        endif
+    endif
+
+    ifndef F_CPU
+        ifdef BOARD_CLOCK
+            F_CPU := $(call PARSE_BOARD,$(BOARD_TAG),menu.(speed|clock).$(BOARD_CLOCK).build.f_cpu)
+        endif
+        ifndef F_CPU
+            F_CPU := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).build.f_cpu)
+        endif
+        ifndef F_CPU
+            F_CPU := $(call PARSE_BOARD,$(BOARD_TAG),build.f_cpu)
+        endif
+    endif
+
+    ifneq ($(CATERINA),)
+        # USB IDs for the caterina devices like leonardo or micro
+        ifndef USB_VID
+            USB_VID = $(call PARSE_BOARD,$(BOARD_TAG),build.vid)
+        endif
+
+        # coping with 2-3 methods sparkfun use for usb.pid
+        ifndef USB_PID
+            USB_PID := $(call PARSE_BOARD,$(BOARD_TAG),build.pid)
+            ifndef USB_PID
+                USB_PID := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).build.pid)
+            endif
+        endif
+
+        ifndef USB_PRODUCT
+            USB_PRODUCT := $(call PARSE_BOARD,$(BOARD_TAG),build.usb_product)
+            ifdef USB_PRODUCT
+                $(call show_config_variable,USB_PRODUCT,[COMPUTED])
+            endif
+        endif
+
+        ifndef USB_MANUFACTURER
+            USB_MANUFACTURER := $(call PARSE_BOARD,$(BOARD_TAG),build.usb_manufacturer)
+            ifndef USB_MANUFACTURER
+                USB_MANUFACTURER = "Unknown"
+            else
+                $(call show_config_variable,USB_MANUFACTURER,[COMPUTED])
+            endif
+        endif
+
+        # add caterina flag to ARD_RESET_OPTS
+        # ARD_RESET_OPTS += --caterina
+    endif
+
+    # normal programming info
+    ifndef AVRDUDE_ARD_PROGRAMMER
+        AVRDUDE_ARD_PROGRAMMER := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).upload.protocol)
+        ifndef AVRDUDE_ARD_PROGRAMMER
+            AVRDUDE_ARD_PROGRAMMER := $(call PARSE_BOARD,$(BOARD_TAG),upload.protocol)
+        endif
+    endif
+
+    ifndef AVRDUDE_ARD_BAUDRATE
+        AVRDUDE_ARD_BAUDRATE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).upload.speed)
+        ifndef AVRDUDE_ARD_BAUDRATE
+            AVRDUDE_ARD_BAUDRATE := $(call PARSE_BOARD,$(BOARD_TAG),upload.speed)
+        endif
+    endif
+
+    # fuses if you're using e.g. ISP
+    ifndef ISP_LOCK_FUSE_PRE
+        ISP_LOCK_FUSE_PRE = $(call PARSE_BOARD,$(BOARD_TAG),bootloader.unlock_bits)
+    endif
+
+    ifndef ISP_HIGH_FUSE
+        ifdef BOARD_CLOCK
+            ISP_HIGH_FUSE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(speed|clock).$(BOARD_CLOCK).bootloader.high_fuses)
+        endif
+        ifndef ISP_HIGH_FUSE
+            ISP_HIGH_FUSE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).bootloader.high_fuses)
+        endif
+        ifndef ISP_HIGH_FUSE
+            ISP_HIGH_FUSE := $(call PARSE_BOARD,$(BOARD_TAG),bootloader.high_fuses)
+        endif
+    endif
+
+    ifndef ISP_LOW_FUSE
+        ifdef BOARD_CLOCK
+            ISP_LOW_FUSE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(speed|clock).$(BOARD_CLOCK).bootloader.low_fuses)
+        endif
+        ifndef ISP_LOW_FUSE
+            ISP_LOW_FUSE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).bootloader.low_fuses)
+        endif
+        ifndef ISP_LOW_FUSE
+            ISP_LOW_FUSE := $(call PARSE_BOARD,$(BOARD_TAG),bootloader.low_fuses)
+        endif
+    endif
+
+    ifndef ISP_EXT_FUSE
+        ifdef BOARD_CLOCK
+            ISP_EXT_FUSE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(speed|clock).$(BOARD_CLOCK).bootloader.extended_fuses)
+        endif
+        ifndef ISP_EXT_FUSE
+            ISP_EXT_FUSE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).bootloader.extended_fuses)
+        endif
+        ifndef ISP_EXT_FUSE
+            ISP_EXT_FUSE := $(call PARSE_BOARD,$(BOARD_TAG),bootloader.extended_fuses)
+        endif
+    endif
+
+    ifndef BOOTLOADER_PATH
+        BOOTLOADER_PATH = $(call PARSE_BOARD,$(BOARD_TAG),bootloader.path)
+    endif
+
+    ifndef BOOTLOADER_FILE
+        BOOTLOADER_FILE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).bootloader.file)
+        ifndef BOOTLOADER_FILE
+            BOOTLOADER_FILE := $(call PARSE_BOARD,$(BOARD_TAG),bootloader.file)
+        endif
+    endif
+
+    ifndef ISP_LOCK_FUSE_POST
+        ISP_LOCK_FUSE_POST = $(call PARSE_BOARD,$(BOARD_TAG),bootloader.lock_bits)
+    endif
+
+    ifndef HEX_MAXIMUM_SIZE
+        HEX_MAXIMUM_SIZE := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).upload.maximum_size)
+        ifndef HEX_MAXIMUM_SIZE
+            HEX_MAXIMUM_SIZE := $(call PARSE_BOARD,$(BOARD_TAG),upload.maximum_size)
+        endif
+    endif
+
+endif
+
+# Everything gets built in here (include BOARD_TAG now)
+ifndef OBJDIR
+    OBJDIR = build-$(BOARD_TAG)
+    ifdef BOARD_SUB
+        OBJDIR = build-$(BOARD_TAG)-$(BOARD_SUB)
+    endif
+    $(call show_config_variable,OBJDIR,[COMPUTED],(from BOARD_TAG))
+else
+    $(call show_config_variable,OBJDIR,[USER])
+endif
 
 # Now that we have ARDUINO_DIR, ARDMK_VENDOR, ARCHITECTURE and CORE,
 # we can set ARDUINO_CORE_PATH.
-ifeq ($(strip $(CORE)),)
-    ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/$(ARCHITECTURE)/$(ARDUINO_VERSION)/cores/arduino
-    $(call show_config_variable,ARDUINO_CORE_PATH,[DEFAULT])
-else
-    ARDUINO_CORE_PATH = $(ALTERNATE_CORE_PATH)/cores/$(CORE)
-    ifeq ($(wildcard $(ARDUINO_CORE_PATH)),)
-        ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/$(ARCHITECTURE)/$(ARDUINO_VERSION)/cores/$(CORE)
-        $(call show_config_variable,ARDUINO_CORE_PATH,[COMPUTED],(from ARDUINO_DIR, BOARD_TAG and boards.txt))
+ifndef ARDUINO_CORE_PATH
+    ifeq ($(strip $(CORE)),)
+        ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/cores/arduino
+        $(call show_config_variable,ARDUINO_CORE_PATH,[DEFAULT])
     else
-        $(call show_config_variable,ARDUINO_CORE_PATH,[COMPUTED],(from ALTERNATE_CORE_PATH, BOARD_TAG and boards.txt))
+        ARDUINO_CORE_PATH = $(ALTERNATE_CORE_PATH)/cores/$(CORE)
+        ifeq ($(wildcard $(ARDUINO_CORE_PATH)),)
+            ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/cores/$(CORE)
+            $(call show_config_variable,ARDUINO_CORE_PATH,[COMPUTED],(from ARDUINO_DIR, BOARD_TAG and boards.txt))
+        else
+            $(call show_config_variable,ARDUINO_CORE_PATH,[COMPUTED],(from ALTERNATE_CORE_PATH, BOARD_TAG and boards.txt))
+        endif
     endif
+else
+    $(call show_config_variable,ARDUINO_CORE_PATH,[USER])
 endif
 
 ########################################################################
 # Reset
 
-ARD_RESET_ARDUINO := $(PYTHON_CMD) $(ARD_RESET_ARDUINO_PATH)
-RESET_CMD = $(ARD_RESET_ARDUINO) $(DEVICE_PATH)
-$(call show_config_variable,RESET_CMD,[COMPUTED],(from PYTHON_CMD, ARD_RESET_OPTS and MONITOR_PORT))
+ifndef RESET_CMD
+  ARD_RESET_ARDUINO_PATH = tools/reset.py
+
+  ARD_RESET_ARDUINO := $(PYTHON_CMD) $(ARD_RESET_ARDUINO_PATH)
+  ifneq (,$(findstring CYGWIN,$(shell uname -s)))
+      # confirm user is using default cygwin unix Python (which uses ttySx) and not Windows Python (which uses COMx)
+      ifeq ($(PYTHON_CMD),/usr/bin/python)
+        RESET_CMD = $(ARD_RESET_ARDUINO) $(DEVICE_PATH)
+      else
+        RESET_CMD = $(ARD_RESET_ARDUINO) $(call get_monitor_port)
+      endif
+    else
+        RESET_CMD = $(ARD_RESET_ARDUINO) $(call get_monitor_port)
+    endif
+    $(call show_config_variable,RESET_CMD,[COMPUTED],(from PYTHON_CMD, ARD_RESET_OPTS and MONITOR_PORT))
+else
+    $(call show_config_variable,RESET_CMD,[USER])
+endif
 
 ifneq ($(CATERINA),)
     ERROR_ON_CATERINA = $(error On $(BOARD_TAG), raw_xxx operation is not supported)
@@ -213,31 +888,146 @@ else
 endif
 
 ########################################################################
-# Core sources
-ifdef ARDUINO_CORE_PATH
-    CORE_C_SRCS     = $(wildcard $(ARDUINO_CORE_PATH)/*.c)
-    CORE_C_SRCS    += $(wildcard $(ARDUINO_CORE_PATH)/$(TOOL_PREFIX)-libc/*.c)
-    CORE_CPP_SRCS   = $(wildcard $(ARDUINO_CORE_PATH)/*.cpp)
-    CORE_AS_SRCS    = $(wildcard $(ARDUINO_CORE_PATH)/*.S)
+# Local sources
+
+LOCAL_C_SRCS    ?= $(wildcard *.c)
+LOCAL_CPP_SRCS  ?= $(wildcard *.cpp)
+LOCAL_CC_SRCS   ?= $(wildcard *.cc)
+LOCAL_PDE_SRCS  ?= $(wildcard *.pde)
+LOCAL_INO_SRCS  ?= $(wildcard *.ino)
+LOCAL_AS_SRCS   ?= $(wildcard *.S)
+LOCAL_SRCS      = $(LOCAL_C_SRCS)   $(LOCAL_CPP_SRCS) \
+		$(LOCAL_CC_SRCS)   $(LOCAL_PDE_SRCS) \
+		$(LOCAL_INO_SRCS) $(LOCAL_AS_SRCS)
+LOCAL_OBJ_FILES = $(LOCAL_C_SRCS:.c=.c.o)   $(LOCAL_CPP_SRCS:.cpp=.cpp.o) \
+		$(LOCAL_CC_SRCS:.cc=.cc.o)   $(LOCAL_PDE_SRCS:.pde=.pde.o) \
+		$(LOCAL_INO_SRCS:.ino=.ino.o) $(LOCAL_AS_SRCS:.S=.S.o)
+LOCAL_OBJS      = $(patsubst %,$(OBJDIR)/%,$(LOCAL_OBJ_FILES))
+
+ifeq ($(words $(LOCAL_SRCS)), 0)
+    $(error At least one source file (*.ino, *.pde, *.cpp, *c, *cc, *.S) is needed)
+endif
+
+# CHK_SOURCES is used by flymake
+# flymake creates a tmp file in the same directory as the file under edition
+# we must skip the verification in this particular case
+ifeq ($(strip $(CHK_SOURCES)),)
+    ifeq ($(strip $(NO_CORE)),)
+
+        # Ideally, this should just check if there are more than one file
+        ifneq ($(words $(LOCAL_PDE_SRCS) $(LOCAL_INO_SRCS)), 1)
+            ifeq ($(words $(LOCAL_PDE_SRCS) $(LOCAL_INO_SRCS)), 0)
+                $(call show_config_info,No .pde or .ino files found. If you are compiling .c or .cpp files then you need to explicitly include Arduino header files)
+            else
+                #TODO: Support more than one file. https://github.com/sudar/Arduino-Makefile/issues/49
+                $(error Need exactly one .pde or .ino file. This makefile doesn\'t support multiple .ino/.pde files yet)
+            endif
+        endif
+
+    endif
+endif
+
+# core sources
+ifeq ($(strip $(NO_CORE)),)
+    ifdef ARDUINO_CORE_PATH
+        CORE_C_SRCS     = $(wildcard $(ARDUINO_CORE_PATH)/*.c)
+        CORE_C_SRCS    += $(wildcard $(ARDUINO_CORE_PATH)/$(TOOL_PREFIX)-libc/*.c)
+        CORE_CPP_SRCS   = $(wildcard $(ARDUINO_CORE_PATH)/*.cpp)
+        CORE_AS_SRCS    = $(wildcard $(ARDUINO_CORE_PATH)/*.S)
+
+        # ArduinoCore-API
+        CORE_C_SRCS    += $(wildcard $(ARDUINO_CORE_PATH)/api/*.c)
+        CORE_CPP_SRCS  += $(wildcard $(ARDUINO_CORE_PATH)/api/*.cpp)
+
+        # USB Core if samd or sam
+        ifeq ($(findstring sam, $(strip $(ARCHITECTURE))), sam)
+            CORE_C_SRCS    += $(wildcard $(ARDUINO_CORE_PATH)/avr/*.c) # avr core emulation files
+            CORE_C_SRCS    += $(wildcard $(ARDUINO_CORE_PATH)/USB/*.c)
+            CORE_CPP_SRCS  += $(wildcard $(ARDUINO_CORE_PATH)/USB/*.cpp)
+        endif
+
+        ifneq ($(strip $(NO_CORE_MAIN_CPP)),)
+            CORE_CPP_SRCS := $(filter-out %main.cpp, $(CORE_CPP_SRCS))
+            $(call show_config_info,NO_CORE_MAIN_CPP set so core library will not include main.cpp,[MANUAL])
+        endif
+
+        # Add core files for sam devices in CORE_OJBS filtering specific paths
+        ifdef SAM_CORE_PATH
+            SAM_CORE_OBJ_FILES  = $(SAM_CORE_C_SRCS:.c=.c.o) $(SAM_CORE_CPP_SRCS:.cpp=.cpp.o) $(SAM_CORE_AS_SRCS:.S=.S.o)
+            # variant core files
+            CORE_OBJS   += $(patsubst $(SAM_CORE_PATH)/%,  \
+                $(OBJDIR)/core/%, $(filter $(SAM_CORE_PATH)/%, $(SAM_CORE_OBJ_FILES)))
+            # libsam on Due
+            ifdef SAM_LIBSAM_PATH
+            CORE_OBJS   += $(patsubst $(SAM_LIBSAM_PATH)/source/%,  \
+                $(OBJDIR)/core/%, $(filter $(SAM_LIBSAM_PATH)/source/%, $(SAM_CORE_OBJ_FILES)))
+            endif
+            # chip sources on Due
+            ifdef SAM_SYSTEM_PATH
+            CORE_OBJS   += $(patsubst $(SAM_SYSTEM_PATH)/source/%, \
+                $(OBJDIR)/core/%, $(filter $(SAM_SYSTEM_PATH)/source/%, $(SAM_CORE_OBJ_FILES)))
+            endif
+        endif
+
+        CORE_OBJ_FILES  = $(CORE_C_SRCS:.c=.c.o) $(CORE_CPP_SRCS:.cpp=.cpp.o) $(CORE_AS_SRCS:.S=.S.o)
+        CORE_OBJS       += $(patsubst $(ARDUINO_CORE_PATH)/%,  \
+                $(OBJDIR)/core/%,$(CORE_OBJ_FILES))
+    endif
+else
+    $(call show_config_info,NO_CORE set so core library will not be built,[MANUAL])
+endif
+
+
+########################################################################
+# Determine ARDUINO_LIBS automatically
+
+ifndef ARDUINO_LIBS
+    # automatically determine included libraries
+    ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_DIR)/libraries/*)), \
+        $(shell sed -ne 's/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p' $(LOCAL_SRCS)))
+    ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_SKETCHBOOK)/libraries/*)), \
+        $(shell sed -ne 's/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p' $(LOCAL_SRCS)))
+    ARDUINO_LIBS += $(filter $(notdir $(wildcard $(USER_LIB_PATH)/*)), \
+        $(shell sed -ne 's/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p' $(LOCAL_SRCS)))
+    ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_PLATFORM_LIB_PATH)/*)), \
+        $(shell sed -ne 's/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p' $(LOCAL_SRCS)))
+endif
+
+########################################################################
+# Serial monitor (just a screen wrapper)
+
+# Quite how to construct the monitor command seems intimately tied
+# to the command we're using (here screen). So, read the screen docs
+# for more information (search for 'character special device').
 
-    # ArduinoCore-API
-    CORE_C_SRCS    += $(wildcard $(ARDUINO_CORE_PATH)/api/*.c)
-    CORE_CPP_SRCS  += $(wildcard $(ARDUINO_CORE_PATH)/api/*.cpp)
+ifeq ($(strip $(NO_CORE)),)
+    ifndef MONITOR_BAUDRATE
+        ifeq ($(words $(LOCAL_PDE_SRCS) $(LOCAL_INO_SRCS)), 1)
+            SPEED = $(shell egrep -h 'Serial.begin *\([0-9]+\)' $(LOCAL_PDE_SRCS) $(LOCAL_INO_SRCS) | sed -e 's/[^0-9]//g'| head -n1)
+            MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200)
+        endif
 
-    ifneq ($(strip $(NO_CORE_MAIN_CPP)),)
-        CORE_CPP_SRCS := $(filter-out %main.cpp, $(CORE_CPP_SRCS))
-        $(call show_config_info,NO_CORE_MAIN_CPP set so core library will not include main.cpp,[MANUAL])
+        ifeq ($(MONITOR_BAUDRATE),)
+            MONITOR_BAUDRATE = 9600
+            $(call show_config_variable,MONITOR_BAUDRATE,[ASSUMED])
+        else
+            $(call show_config_variable,MONITOR_BAUDRATE,[DETECTED], (in sketch))
+        endif
+    else
+        $(call show_config_variable,MONITOR_BAUDRATE,[USER])
     endif
 
-    CORE_OBJ_FILES  = $(CORE_C_SRCS:.c=.c.o) $(CORE_CPP_SRCS:.cpp=.cpp.o) $(CORE_AS_SRCS:.S=.S.o)
-    CORE_OBJS       += $(patsubst $(ARDUINO_CORE_PATH)/%,  \
-            $(OBJDIR)/core/%,$(CORE_OBJ_FILES))
+    ifndef MONITOR_CMD
+        MONITOR_CMD = $(PYTHON_CMD) tools/monitor.py
+    endif
 endif
 
 ########################################################################
-# Serial monitor baudrate
+# Include Arduino Header file
 
-$(call show_config_variable,MONITOR_BAUDRATE,[USER])
+ifndef ARDUINO_HEADER
+    # ARDUINO_HEADER=Arduino.h
+endif
 
 ########################################################################
 # Rules for making stuff
@@ -249,6 +1039,30 @@ TARGET_EEP = $(OBJDIR)/$(TARGET).eep
 TARGET_BIN = $(OBJDIR)/$(TARGET).bin
 CORE_LIB   = $(OBJDIR)/libcore.a
 
+# Names of executables
+# In the rare case of wanting to override a path and/or excecutable
+# name, the OVERRIDE_EXECUTABLES variable must be defned and _all_
+# the excecutables (CC, CXX, AS, OBJCOPY, OBJDUMP AR, SIZE and NM)
+# _must_ be defined in the calling makefile.
+# We can't use "?=" assignment because these are already implicitly
+# defined by Make (e.g. $(CC) == cc).
+ifndef OVERRIDE_EXECUTABLES
+    CC      = $(TOOLS_PATH)/$(CC_NAME)
+    CXX     = $(TOOLS_PATH)/$(CXX_NAME)
+    AS      = $(TOOLS_PATH)/$(AS_NAME)
+    OBJCOPY = $(TOOLS_PATH)/$(OBJCOPY_NAME)
+    OBJDUMP = $(TOOLS_PATH)/$(OBJDUMP_NAME)
+    AR      = $(TOOLS_PATH)/$(AR_NAME)
+    SIZE    = $(TOOLS_PATH)/$(SIZE_NAME)
+    NM      = $(TOOLS_PATH)/$(NM_NAME)
+endif
+
+REMOVE  = rm -rf
+MV      = mv -f
+CAT     = cat
+ECHO    = printf
+MKDIR   = mkdir -p
+
 # recursive wildcard function, call with params:
 #  - start directory (finished with /) or empty string for current dir
 #  - glob pattern
@@ -274,42 +1088,43 @@ get_library_files  = $(if $(and $(wildcard $(1)/src), $(wildcard $(1)/library.pr
                         $(wildcard $(1)/*.$(2) $(1)/utility/*.$(2)))
 
 # General arguments
-PROJ_LIBS      := $(sort $(wildcard $(patsubst %,$(PROJ_LIBS_PATH)/%,$(ARDUINO_LIBS))))
-PROJ_LIB_NAMES := $(patsubst $(PROJ_LIBS_PATH)/%,%,$(PROJ_LIBS))
+USER_LIBS      := $(sort $(wildcard $(patsubst %,$(USER_LIB_PATH)/%,$(ARDUINO_LIBS))))
+USER_LIB_NAMES := $(patsubst $(USER_LIB_PATH)/%,%,$(USER_LIBS))
 
 # Let user libraries override system ones.
-SYS_LIBS       := $(sort $(wildcard $(patsubst %,$(ARDUINO_LIB_PATH)/%,$(filter-out $(PROJ_LIB_NAMES),$(ARDUINO_LIBS)))))
+SYS_LIBS       := $(sort $(wildcard $(patsubst %,$(ARDUINO_LIB_PATH)/%,$(filter-out $(USER_LIB_NAMES),$(ARDUINO_LIBS)))))
 SYS_LIB_NAMES  := $(patsubst $(ARDUINO_LIB_PATH)/%,%,$(SYS_LIBS))
 
 ifdef ARDUINO_PLATFORM_LIB_PATH
-    PLATFORM_LIBS       := $(sort $(wildcard $(patsubst %,$(ARDUINO_PLATFORM_LIB_PATH)/%,$(filter-out $(PROJ_LIB_NAMES),$(ARDUINO_LIBS)))))
+    PLATFORM_LIBS       := $(sort $(wildcard $(patsubst %,$(ARDUINO_PLATFORM_LIB_PATH)/%,$(filter-out $(USER_LIB_NAMES),$(ARDUINO_LIBS)))))
     PLATFORM_LIB_NAMES  := $(patsubst $(ARDUINO_PLATFORM_LIB_PATH)/%,%,$(PLATFORM_LIBS))
 endif
 
+
 # Error here if any are missing.
-LIBS_NOT_FOUND = $(filter-out $(PROJ_LIB_NAMES) $(SYS_LIB_NAMES) $(PLATFORM_LIB_NAMES),$(ARDUINO_LIBS))
+LIBS_NOT_FOUND = $(filter-out $(USER_LIB_NAMES) $(SYS_LIB_NAMES) $(PLATFORM_LIB_NAMES),$(ARDUINO_LIBS))
 ifneq (,$(strip $(LIBS_NOT_FOUND)))
     ifdef ARDUINO_PLATFORM_LIB_PATH
-        $(error The following libraries specified in ARDUINO_LIBS could not be found (searched PROJ_LIBS_PATH, ARDUINO_LIB_PATH and ARDUINO_PLATFORM_LIB_PATH): $(LIBS_NOT_FOUND))
+        $(error The following libraries specified in ARDUINO_LIBS could not be found (searched USER_LIB_PATH, ARDUINO_LIB_PATH and ARDUINO_PLATFORM_LIB_PATH): $(LIBS_NOT_FOUND))
     else
-        $(error The following libraries specified in ARDUINO_LIBS could not be found (searched PROJ_LIBS_PATH and ARDUINO_LIB_PATH): $(LIBS_NOT_FOUND))
+        $(error The following libraries specified in ARDUINO_LIBS could not be found (searched USER_LIB_PATH and ARDUINO_LIB_PATH): $(LIBS_NOT_FOUND))
     endif
 endif
 
 SYS_INCLUDES        := $(foreach lib, $(SYS_LIBS),  $(call get_library_includes,$(lib)))
-PROJ_INCLUDES       := $(foreach lib, $(PROJ_LIBS), $(call get_library_includes,$(lib)))
+USER_INCLUDES       := $(foreach lib, $(USER_LIBS), $(call get_library_includes,$(lib)))
 LIB_C_SRCS          := $(foreach lib, $(SYS_LIBS),  $(call get_library_files,$(lib),c))
 LIB_CPP_SRCS        := $(foreach lib, $(SYS_LIBS),  $(call get_library_files,$(lib),cpp))
 LIB_AS_SRCS         := $(foreach lib, $(SYS_LIBS),  $(call get_library_files,$(lib),S))
-PROJ_LIB_CPP_SRCS   := $(foreach lib, $(PROJ_LIBS), $(call get_library_files,$(lib),cpp))
-PROJ_LIB_C_SRCS     := $(foreach lib, $(PROJ_LIBS), $(call get_library_files,$(lib),c))
-PROJ_LIB_AS_SRCS    := $(foreach lib, $(PROJ_LIBS), $(call get_library_files,$(lib),S))
+USER_LIB_CPP_SRCS   := $(foreach lib, $(USER_LIBS), $(call get_library_files,$(lib),cpp))
+USER_LIB_C_SRCS     := $(foreach lib, $(USER_LIBS), $(call get_library_files,$(lib),c))
+USER_LIB_AS_SRCS    := $(foreach lib, $(USER_LIBS), $(call get_library_files,$(lib),S))
 LIB_OBJS            = $(patsubst $(ARDUINO_LIB_PATH)/%.c,$(OBJDIR)/libs/%.c.o,$(LIB_C_SRCS)) \
                       $(patsubst $(ARDUINO_LIB_PATH)/%.cpp,$(OBJDIR)/libs/%.cpp.o,$(LIB_CPP_SRCS)) \
                       $(patsubst $(ARDUINO_LIB_PATH)/%.S,$(OBJDIR)/libs/%.S.o,$(LIB_AS_SRCS))
-PROJ_LIB_OJS       = $(patsubst $(PROJ_LIBS_PATH)/%.cpp,$(OBJDIR)/projlibs/%.cpp.o,$(PROJ_LIB_CPP_SRCS)) \
-                      $(patsubst $(PROJ_LIBS_PATH)/%.c,$(OBJDIR)/projlibs/%.c.o,$(PROJ_LIB_C_SRCS)) \
-                      $(patsubst $(PROJ_LIBS_PATH)/%.S,$(OBJDIR)/projlibs/%.S.o,$(PROJ_LIB_AS_SRCS))
+USER_LIB_OBJS       = $(patsubst $(USER_LIB_PATH)/%.cpp,$(OBJDIR)/userlibs/%.cpp.o,$(USER_LIB_CPP_SRCS)) \
+                      $(patsubst $(USER_LIB_PATH)/%.c,$(OBJDIR)/userlibs/%.c.o,$(USER_LIB_C_SRCS)) \
+                      $(patsubst $(USER_LIB_PATH)/%.S,$(OBJDIR)/userlibs/%.S.o,$(USER_LIB_AS_SRCS))
 
 ifdef ARDUINO_PLATFORM_LIB_PATH
     PLATFORM_INCLUDES     := $(foreach lib, $(PLATFORM_LIBS), $(call get_library_includes,$(lib)))
@@ -319,24 +1134,43 @@ ifdef ARDUINO_PLATFORM_LIB_PATH
     PLATFORM_LIB_OBJS     := $(patsubst $(ARDUINO_PLATFORM_LIB_PATH)/%.cpp,$(OBJDIR)/platformlibs/%.cpp.o,$(PLATFORM_LIB_CPP_SRCS)) \
                              $(patsubst $(ARDUINO_PLATFORM_LIB_PATH)/%.c,$(OBJDIR)/platformlibs/%.c.o,$(PLATFORM_LIB_C_SRCS)) \
                              $(patsubst $(ARDUINO_PLATFORM_LIB_PATH)/%.S,$(OBJDIR)/platformlibs/%.S.o,$(PLATFORM_LIB_AS_SRCS))
+
 endif
 
 # Dependency files
-DEPS = $(LOCAL_OBJS:.o=.d) $(LIB_OBJS:.o=.d) $(PLATFORM_OBJS:.o=.d) $(PROJ_LIB_OJS:.o=.d) $(CORE_OBJS:.o=.d)
+DEPS                = $(LOCAL_OBJS:.o=.d) $(LIB_OBJS:.o=.d) $(PLATFORM_OBJS:.o=.d) $(USER_LIB_OBJS:.o=.d) $(CORE_OBJS:.o=.d)
+
+# Optimization level for the compiler.
+# You can get the list of options at http://www.nongnu.org/avr-libc/user-manual/using_tools.html#gcc_optO
+# Also read http://www.nongnu.org/avr-libc/user-manual/FAQ.html#faq_optflags
+ifndef OPTIMIZATION_LEVEL
+    OPTIMIZATION_LEVEL=s
+    $(call show_config_variable,OPTIMIZATION_LEVEL,[DEFAULT])
+else
+    $(call show_config_variable,OPTIMIZATION_LEVEL,[USER])
+endif
 
-$(call show_config_variable,OPTIMIZATION_LEVEL,[DEFAULT])
+ifndef DEBUG_FLAGS
+    DEBUG_FLAGS = -O0 -g
+endif
 
 # SoftwareSerial requires -Os (some delays are tuned for this optimization level)
 %SoftwareSerial.cpp.o : OPTIMIZATION_FLAGS = -Os
 %Uart.cpp.o : OPTIMIZATION_FLAGS = -Os
 
-$(call show_config_variable,MCU_FLAG_NAME,[DEFAULT])
+ifndef MCU_FLAG_NAME
+    MCU_FLAG_NAME = mmcu
+    $(call show_config_variable,MCU_FLAG_NAME,[DEFAULT])
+else
+    $(call show_config_variable,MCU_FLAG_NAME,[USER])
+endif
 
-CPPFLAGS += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION_SHORT) -DARDUINO_$(BOARD) $(ARDUINO_ARCH_FLAG) \
-    "-DARDUINO_BOARD=\"$(BOARD)\"" "-DARDUINO_VARIANT=\"$(VARIANT)\"" \
-    -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_CORE_PATH)/api -I$(ARDUINO_VAR_PATH)/$(VARIANT) \
-    $(SYS_INCLUDES) $(PLATFORM_INCLUDES) $(PROJ_INCLUDES) -Wall -ffunction-sections \
-    -fdata-sections
+# Using += instead of =, so that CPPFLAGS can be set per sketch level
+CPPFLAGS      += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) -DARDUINO_$(BOARD) $(ARDUINO_ARCH_FLAG) \
+         "-DARDUINO_BOARD=\"$(BOARD)\"" "-DARDUINO_VARIANT=\"$(VARIANT)\"" \
+        -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_CORE_PATH)/api -I$(ARDUINO_VAR_PATH)/$(VARIANT) \
+        $(SYS_INCLUDES) $(PLATFORM_INCLUDES) $(USER_INCLUDES) \
+		-Wall -ffunction-sections -fdata-sections
 
 # PROG_TYPES_COMPAT is enabled by default for compatibility with the Arduino IDE.
 # By placing it before the user-provided CPPFLAGS rather than after, we allow the
@@ -345,17 +1179,19 @@ CPPFLAGS += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSIO
 CPPFLAGS := -D__PROG_TYPES_COMPAT__ $(CPPFLAGS)
 
 ifdef DEBUG
-    OPTIMIZATION_FLAGS= $(DEBUG_FLAGS)
+OPTIMIZATION_FLAGS= $(DEBUG_FLAGS)
 else
-    OPTIMIZATION_FLAGS = -O$(OPTIMIZATION_LEVEL)
+OPTIMIZATION_FLAGS = -O$(OPTIMIZATION_LEVEL)
 endif
 
 CPPFLAGS += $(OPTIMIZATION_FLAGS)
 
 # USB IDs for the Caterina devices like leonardo or micro
-CPPFLAGS += -DUSB_VID=$(USB_VID) -DUSB_PID=$(USB_PID)
-ifdef USB_PRODUCT
-    CPPFLAGS += -DUSB_PRODUCT='$(USB_PRODUCT)' -DUSB_MANUFACTURER='$(USB_MANUFACTURER)'
+ifneq ($(CATERINA),)
+    CPPFLAGS += -DUSB_VID=$(USB_VID) -DUSB_PID=$(USB_PID)
+    ifdef USB_PRODUCT
+        CPPFLAGS += -DUSB_PRODUCT='$(USB_PRODUCT)' -DUSB_MANUFACTURER='$(USB_MANUFACTURER)'
+    endif
 endif
 
 # $(TOOL_PREFIX)-gcc version that we can do maths on
@@ -364,29 +1200,35 @@ CC_VERNUM = $(shell $(CC) -dumpversion | sed 's/\.//g')
 # moved from above so we can find version-dependant ar
 ifeq ($(TOOL_PREFIX), avr)
     ifeq ($(shell expr $(CC_VERNUM) '>' 490), 1)
-        AR_NAME := $(TOOL_PREFIX)-gcc-ar
+        AR_NAME      := $(TOOL_PREFIX)-gcc-ar
     else
-        AR_NAME := $(TOOL_PREFIX)-ar
+        AR_NAME      := $(TOOL_PREFIX)-ar
     endif
 endif
 
-ifeq ($(shell expr $(CC_VERNUM) '>' 490), 1)
-    CFLAGS_STD = -std=gnu11
+ifndef CFLAGS_STD
+    ifeq ($(shell expr $(CC_VERNUM) '>' 490), 1)
+        CFLAGS_STD      = -std=gnu11
+    else
+        CFLAGS_STD        =
+    endif
+    $(call show_config_variable,CFLAGS_STD,[DEFAULT])
 else
-    CFLAGS_STD =
+    $(call show_config_variable,CFLAGS_STD,[USER])
 endif
-$(call show_config_variable,CFLAGS_STD,[DEFAULT])
 
-ifeq ($(shell expr $(CC_VERNUM) '>' 490), 1)
-    CXXFLAGS_STD = -std=gnu++11
+ifndef CXXFLAGS_STD
+    CXXFLAGS_STD = -std=gnu++17
+    $(call show_config_variable,CXXFLAGS_STD,[DEFAULT])
 else
-    CXXFLAGS_STD =
+    $(call show_config_variable,CXXFLAGS_STD,[USER])
 endif
-$(call show_config_variable,CXXFLAGS_STD,[DEFAULT])
 
-CFLAGS += $(CFLAGS_STD)
-CXXFLAGS += -fpermissive -fno-exceptions $(CXXFLAGS_STD)
-ASFLAGS += -x assembler-with-cpp
+CFLAGS        += $(CFLAGS_STD)
+CXXFLAGS      += -fno-exceptions $(CXXFLAGS_STD) -Wall -Wextra -Wpedantic \
+				 -Wshadow -Wcast-align -Wunused \
+				 -pedantic
+ASFLAGS       += -x assembler-with-cpp
 DIAGNOSTICS_COLOR_WHEN ?= always
 
 # Flags for AVR
@@ -405,24 +1247,56 @@ else
     endif
 endif
 
-LDFLAGS += -$(MCU_FLAG_NAME)=$(MCU) -Wl,--gc-sections -O$(OPTIMIZATION_LEVEL)
-SIZEFLAGS ?= --mcu=$(MCU) -C
+LDFLAGS       += -$(MCU_FLAG_NAME)=$(MCU) -Wl,--gc-sections -O$(OPTIMIZATION_LEVEL)
+SIZEFLAGS     ?= --mcu=$(MCU) -C
 
+# for backwards compatibility, grab ARDUINO_PORT if the user has it set
+# instead of MONITOR_PORT
 MONITOR_PORT ?= $(ARDUINO_PORT)
 
 ifneq ($(strip $(MONITOR_PORT)),)
-	DEVICE_PATH = $(MONITOR_PORT)
+    ifeq ($(CURRENT_OS), WINDOWS)
+        # Expect MONITOR_PORT to be '1' or 'com1' for COM1 in Windows. Split it up
+        # into the two styles required: /dev/ttyS* for ard-reset-arduino and com*
+        # for avrdude. This also could work with /dev/com* device names and be more
+        # consistent, but the /dev/com* is not recommended by Cygwin and doesn't
+        # always show up.
+        COM_PORT_ID = $(subst com,,$(MONITOR_PORT))
+        COM_STYLE_MONITOR_PORT = com$(COM_PORT_ID)
+        DEVICE_PATH = /dev/ttyS$(shell awk 'BEGIN{ print $(COM_PORT_ID) - 1 }')
+    else
+        # set DEVICE_PATH based on user-defined MONITOR_PORT or ARDUINO_PORT
+        DEVICE_PATH = $(MONITOR_PORT)
+    endif
     $(call show_config_variable,DEVICE_PATH,[COMPUTED],(from MONITOR_PORT))
 else
     # If no port is specified, try to guess it from wildcards.
     # Will only work if the Arduino is the only/first device matched.
     DEVICE_PATH = $(firstword $(wildcard \
-		/dev/ttyACM? /dev/ttyUSB? /dev/tty.usbserial* /dev/tty.usbmodem* /dev/tty.wchusbserial*))
+			/dev/ttyACM? /dev/ttyUSB? /dev/tty.usbserial* /dev/tty.usbmodem* /dev/tty.wchusbserial*))
     $(call show_config_variable,DEVICE_PATH,[AUTODETECTED])
 endif
 
-# Returns the Arduino port (first wildcard expansion) if it exists, otherwise it errors.
-get_monitor_port = $(if $(wildcard $(DEVICE_PATH)),$(firstword $(wildcard $(DEVICE_PATH))),$(error Arduino port $(DEVICE_PATH) not found!))
+ifndef FORCE_MONITOR_PORT
+    $(call show_config_variable,FORCE_MONITOR_PORT,[DEFAULT])
+else
+    $(call show_config_variable,FORCE_MONITOR_PORT,[USER])
+endif
+
+ifdef FORCE_MONITOR_PORT
+    # Skips the DEVICE_PATH existance check.
+    get_monitor_port = $(DEVICE_PATH)
+else
+    # Returns the Arduino port (first wildcard expansion) if it exists, otherwise it errors.
+    ifeq ($(CURRENT_OS), WINDOWS)
+        get_monitor_port = $(COM_STYLE_MONITOR_PORT)
+    else
+        get_monitor_port = $(DEVICE_PATH)
+    endif
+endif
+
+# Returns the ISP port (first wildcard expansion) if it exists, otherwise it errors.
+get_isp_port = $(if $(wildcard $(ISP_PORT)),$(firstword $(wildcard $(ISP_PORT))),$(if $(findstring Xusb,X$(ISP_PORT)),$(ISP_PORT),$(error ISP port $(ISP_PORT) not found!)))
 
 # Command for avr_size: do $(call avr_size,elffile,hexfile)
 ifneq (,$(findstring AVR,$(shell $(SIZE) --help)))
@@ -446,8 +1320,8 @@ ifneq (,$(strip $(ARDUINO_LIBS)))
     $(call show_config_info,ARDUINO_LIBS =)
 endif
 
-ifneq (,$(strip $(PROJ_LIB_NAMES)))
-    $(foreach lib,$(PROJ_LIB_NAMES),$(call show_config_info,  $(lib),[USER]))
+ifneq (,$(strip $(USER_LIB_NAMES)))
+    $(foreach lib,$(USER_LIB_NAMES),$(call show_config_info,  $(lib),[USER]))
 endif
 
 ifneq (,$(strip $(SYS_LIB_NAMES)))
@@ -458,10 +1332,19 @@ ifneq (,$(strip $(PLATFORM_LIB_NAMES)))
     $(foreach lib,$(PLATFORM_LIB_NAMES),$(call show_config_info,  $(lib),[PLATFORM]))
 endif
 
-$(call show_config_variable,BOOTLOADER_PARENT,[DEFAULT])
+# either calculate parent dir from arduino dir, or user-defined path
+ifndef BOOTLOADER_PARENT
+    BOOTLOADER_PARENT = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE)/bootloaders
+    $(call show_config_variable,BOOTLOADER_PARENT,[COMPUTED],(from ARDUINO_DIR))
+else
+    $(call show_config_variable,BOOTLOADER_PARENT,[USER])
+endif
 
 ########################################################################
 # Tools version info
+ARDMK_VERSION = 1.6
+$(call show_config_variable,ARDMK_VERSION,[COMPUTED])
+
 CC_VERSION := $(shell $(CC) -dumpversion)
 $(call show_config_variable,CC_VERSION,[COMPUTED],($(CC_NAME)))
 
@@ -501,15 +1384,15 @@ $(OBJDIR)/platformlibs/%.S.o: $(ARDUINO_PLATFORM_LIB_PATH)/%.S
 	@$(MKDIR) $(dir $@)
 	$(CC) -MMD -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
 
-$(OBJDIR)/projlibs/%.cpp.o: $(PROJ_LIBS_PATH)/%.cpp
+$(OBJDIR)/userlibs/%.cpp.o: $(USER_LIB_PATH)/%.cpp
 	@$(MKDIR) $(dir $@)
 	$(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
-$(OBJDIR)/projlibs/%.c.o: $(PROJ_LIBS_PATH)/%.c
+$(OBJDIR)/userlibs/%.c.o: $(USER_LIB_PATH)/%.c
 	@$(MKDIR) $(dir $@)
 	$(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@
 
-$(OBJDIR)/projlibs/%.S.o: $(PROJ_LIBS_PATH)/%.S
+$(OBJDIR)/userlibs/%.S.o: $(USER_LIB_PATH)/%.S
 	@$(MKDIR) $(dir $@)
 	$(CC) -MMD -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
 
@@ -540,6 +1423,15 @@ $(OBJDIR)/%.s.o: %.s $(COMMON_DEPS) | $(OBJDIR)
 	@$(MKDIR) $(dir $@)
 	$(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
 
+# the pde -> o file
+$(OBJDIR)/%.pde.o: %.pde $(COMMON_DEPS) | $(OBJDIR)
+	@$(MKDIR) $(dir $@)
+	$(CXX) -x c++ -include $(ARDUINO_HEADER) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+
+# the ino -> o file
+$(OBJDIR)/%.ino.o: %.ino $(COMMON_DEPS) | $(OBJDIR)
+	@$(MKDIR) $(dir $@)
+	$(CXX) -x c++ -include $(ARDUINO_HEADER) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
 # generated assembly
 $(OBJDIR)/%.s: %.pde $(COMMON_DEPS) | $(OBJDIR)
@@ -622,17 +1514,41 @@ $(OBJDIR)/%.sym: $(OBJDIR)/%.elf $(COMMON_DEPS)
 ########################################################################
 # Ctags
 
+# Assume ctags is on path unless has been specified
+ifndef CTAGS_EXEC
+    CTAGS_EXEC = ctags
+endif
+
+# Default to 'tags' unless user has specified a tags file
+ifndef TAGS_FILE
+    TAGS_FILE = tags
+endif
+
 # ctags command: append, flags unsort (as will be sorted after) and specify filename
 CTAGS_CMD = $(CTAGS_EXEC) $(CTAGS_OPTS) -auf
 
 ########################################################################
 # Avrdude
 
-AVRDUDE = $(ARDUINO_DIR)/tools/avrdude/$(shell /bin/ls --color=never -1 $(ARDUINO_DIR)/tools/avrdude | sort -r | xargs | awk '{print $$1}')/bin/avrdude
+# If avrdude is installed separately, it can find its own config file
+ifndef AVRDUDE
+    AVRDUDE          = $(TOOLS_PATH)/avrdude
+endif
 
-AVRDUDE_OPTS = -q -V
+# Default avrdude options
+# -V Do not verify
+# -q - suppress progress output
+ifndef AVRDUDE_OPTS
+    AVRDUDE_OPTS = -q -V
+endif
 
-AVRDUDE_MCU = $(MCU)
+# Decouple the mcu between the compiler options (-mmcu) and the avrdude options (-p).
+# This is needed to be able to compile for attiny84a but specify the upload mcu as attiny84.
+# We default to picking the -mmcu flag, but you can override this by setting
+# AVRDUDE_MCU in your makefile.
+ifndef AVRDUDE_MCU
+  AVRDUDE_MCU = $(MCU)
+endif
 
 AVRDUDE_COM_OPTS = $(AVRDUDE_OPTS) -p $(AVRDUDE_MCU)
 ifdef AVRDUDE_CONF
@@ -647,15 +1563,105 @@ else
     AVRDUDE_ARD_OPTS = -D
 endif
 AVRDUDE_ARD_OPTS += -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P
-AVRDUDE_ARD_OPTS += $(call get_monitor_port)
+#ifeq ($(CURRENT_OS), WINDOWS)
+    # get_monitor_port checks to see if the monitor port exists, assuming it is
+    # a file. In Windows, avrdude needs the port in the format 'com1' which is
+    # not a file, so we have to add the COM-style port directly.
+    #AVRDUDE_ARD_OPTS += $(COM_STYLE_MONITOR_PORT)
+#else
+#    AVRDUDE_ARD_OPTS += $(call get_monitor_port)
+#endif
+
+ifndef ISP_PROG
+    ifneq ($(strip $(AVRDUDE_ARD_PROGRAMMER)),)
+        ISP_PROG = $(AVRDUDE_ARD_PROGRAMMER)
+    else
+        ISP_PROG = stk500v1
+    endif
+endif
+
+ifndef AVRDUDE_ISP_BAUDRATE
+    ifneq ($(strip $(AVRDUDE_ARD_BAUDRATE)),)
+        AVRDUDE_ISP_BAUDRATE = $(AVRDUDE_ARD_BAUDRATE)
+    else
+        AVRDUDE_ISP_BAUDRATE = 19200
+    endif
+endif
+
+# Fuse settings copied from Arduino IDE.
+# https://github.com/arduino/Arduino/blob/master/app/src/processing/app/debug/AvrdudeUploader.java#L254
+
+# Pre fuse settings
+ifndef AVRDUDE_ISP_FUSES_PRE
+    ifneq ($(strip $(ISP_LOCK_FUSE_PRE)),)
+        AVRDUDE_ISP_FUSES_PRE += -U lock:w:$(ISP_LOCK_FUSE_PRE):m
+    endif
+
+    ifneq ($(strip $(ISP_EXT_FUSE)),)
+        AVRDUDE_ISP_FUSES_PRE += -U efuse:w:$(ISP_EXT_FUSE):m
+    endif
+
+    ifneq ($(strip $(ISP_HIGH_FUSE)),)
+        AVRDUDE_ISP_FUSES_PRE += -U hfuse:w:$(ISP_HIGH_FUSE):m
+    endif
+
+    ifneq ($(strip $(ISP_LOW_FUSE)),)
+        AVRDUDE_ISP_FUSES_PRE += -U lfuse:w:$(ISP_LOW_FUSE):m
+    endif
+endif
+
+# Bootloader file settings
+ifndef AVRDUDE_ISP_BURN_BOOTLOADER
+    ifneq ($(strip $(BOOTLOADER_FILE)),)
+        AVRDUDE_ISP_BURN_BOOTLOADER += -U flash:w:$(BOOTLOADER_PARENT)/$(BOOTLOADER_PATH)/$(BOOTLOADER_FILE):i
+    endif
+endif
+
+# Post fuse settings
+ifndef AVRDUDE_ISP_FUSES_POST
+    ifneq ($(strip $(ISP_LOCK_FUSE_POST)),)
+        AVRDUDE_ISP_FUSES_POST += -U lock:w:$(ISP_LOCK_FUSE_POST):m
+    endif
+endif
+
+# Note: setting -D to disable flash erase before programming may cause issues
+# with some boards like attiny84a, making the program not "take",
+# so we do not set it by default.
+AVRDUDE_ISP_OPTS = -c $(ISP_PROG) -b $(AVRDUDE_ISP_BAUDRATE)
+
+ifndef ISP_PORT
+    ifneq ($(strip $(ISP_PROG)),$(filter $(ISP_PROG), atmelice_isp usbasp usbtiny gpio linuxgpio avrispmkii dragon_isp dragon_dw))
+        # switch for sam devices as bootloader will be on usb serial if using stk500_v2
+        ifeq ($(findstring sam, $(strip $(ARCHITECTURE))), sam)
+            AVRDUDE_ISP_OPTS += -P $(call get_monitor_port)
+        else
+            AVRDUDE_ISP_OPTS += -P $(call get_isp_port)
+        endif
+    endif
+else
+    ifeq ($(CURRENT_OS), WINDOWS)
+        AVRDUDE_ISP_OPTS += -P $(ISP_PORT)
+    else
+        AVRDUDE_ISP_OPTS += -P $(call get_isp_port)
+    endif
+endif
+
+ifndef ISP_EEPROM
+    ISP_EEPROM  = 0
+endif
 
 AVRDUDE_UPLOAD_HEX = -U flash:w:$(TARGET_HEX):i
 AVRDUDE_UPLOAD_EEP = -U eeprom:w:$(TARGET_EEP):i
+AVRDUDE_ISPLOAD_OPTS = $(AVRDUDE_UPLOAD_HEX)
+
+ifneq ($(ISP_EEPROM), 0)
+    AVRDUDE_ISPLOAD_OPTS += $(AVRDUDE_UPLOAD_EEP)
+endif
 
 ########################################################################
 # Explicit targets start here
 
-all: $(TARGET_EEP) $(TARGET_BIN) $(TARGET_HEX)
+all: 		$(TARGET_EEP) $(TARGET_BIN) $(TARGET_HEX)
 
 # Rule to create $(OBJDIR) automatically. All rules with recipes that
 # create a file within it, but do not already depend on a file within it
@@ -664,80 +1670,151 @@ all: $(TARGET_EEP) $(TARGET_BIN) $(TARGET_HEX)
 # list) to prevent remaking the target when any file in the directory
 # changes.
 $(OBJDIR): pre-build
-	$(MKDIR) $(OBJDIR)
+		$(MKDIR) $(OBJDIR)
 
 pre-build:
-    $(call runscript_if_exists,$(PRE_BUILD_HOOK))
+		$(call runscript_if_exists,$(PRE_BUILD_HOOK))
 
 # copied from arduino with start-group, end-group
-$(TARGET_ELF): $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(LOCAL_OBJS) $(OTHER_OBJS) $(OTHER_LIBS) $(CORE_LIB) -lc -lm $(LINKER_SCRIPTS)
+$(TARGET_ELF): 	$(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS)
+# sam devices need start and end group, and must be linked using C++ compiler
+ifeq ($(findstring sam, $(strip $(ARCHITECTURE))), sam)
+		$(CXX) $(LINKER_SCRIPTS) -Wl,-Map=$(OBJDIR)/$(TARGET).map -o $@ $(LOCAL_OBJS) $(OTHER_OBJS) $(OTHER_LIBS) $(LDFLAGS) $(CORE_LIB) -Wl,--end-group
+# otherwise traditional
+else
+		$(CC) $(LDFLAGS) -o $@ $(LOCAL_OBJS) $(OTHER_OBJS) $(OTHER_LIBS) $(CORE_LIB) -lc -lm $(LINKER_SCRIPTS)
+endif
 
-$(CORE_LIB): $(CORE_OBJS) $(LIB_OBJS) $(PLATFORM_LIB_OBJS) $(PROJ_LIB_OJS)
-	$(AR) rcs $@ $(CORE_OBJS) $(LIB_OBJS) $(PLATFORM_LIB_OBJS) $(PROJ_LIB_OJS)
+$(CORE_LIB):	$(CORE_OBJS) $(LIB_OBJS) $(PLATFORM_LIB_OBJS) $(USER_LIB_OBJS)
+		$(AR) rcs $@ $(CORE_OBJS) $(LIB_OBJS) $(PLATFORM_LIB_OBJS) $(USER_LIB_OBJS)
 
 error_on_caterina:
-	$(ERROR_ON_CATERINA)
+		$(ERROR_ON_CATERINA)
 
 # Use submake so we can guarantee the reset happens
 # before the upload, even with make -j
-upload:	$(TARGET_HEX) verify_size
-ifeq ($(DEVICE_PATH),)
-	echo $(error Error: No Arduino device is connected)
+upload:		$(TARGET_HEX) verify_size
+ifeq ($(findstring sam, $(strip $(ARCHITECTURE))), sam)
+# do reset toggle at 1200 BAUD to enter bootloader if using avrdude or bossa
+#ifeq ($(strip $(UPLOAD_TOOL)), avrdude)
+#		$(MAKE) reset
+#else ifeq ($(findstring bossac, $(strip $(UPLOAD_TOOL))), bossac)
+#		$(MAKE) reset
+#endif
+		$(MAKE) do_sam_upload
+else
+#		$(MAKE) reset
+		$(MAKE) do_upload
 endif
-	$(MAKE) reset
-	$(MAKE) do_upload
 
 raw_upload:	$(TARGET_HEX) verify_size
-	$(MAKE) error_on_caterina
-	$(MAKE) do_upload
+ifeq ($(findstring sam, $(strip $(ARCHITECTURE))), sam)
+		$(MAKE) do_sam_upload
+else
+		$(MAKE) error_on_caterina
+		$(MAKE) do_upload
+endif
 
 do_upload:
-	$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) $(AVRDUDE_UPLOAD_HEX)
+		./tools/upload.sh $(DEVICE_PATH) $(PYTHON_CMD) "$(AVRDUDE)" "$(AVRDUDE_COM_OPTS)" "$(AVRDUDE_ARD_OPTS)" "$(AVRDUDE_UPLOAD_HEX)"
+# $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) $(shell $(RESET_CMD)) $(AVRDUDE_UPLOAD_HEX)
+
+do_sam_upload:  $(TARGET_BIN) verify_size
+ifeq ($(findstring openocd, $(strip $(UPLOAD_TOOL))), openocd)
+		$(OPENOCD) $(OPENOCD_OPTS) -c "telnet_port disabled; program {{$(TARGET_BIN)}} verify reset $(BOOTLOADER_SIZE); shutdown"
+else ifeq ($(findstring bossac, $(strip $(UPLOAD_TOOL))), bossac)
+		$(BOSSA) $(BOSSA_OPTS) $(TARGET_BIN)
+else ifeq ($(findstring gdb, $(strip $(UPLOAD_TOOL))), gdb)
+		$(GDB) $(GDB_UPLOAD_OPTS)
+else ifeq ($(strip $(UPLOAD_TOOL)), avrdude)
+		$(MAKE) ispload
+else
+		@$(ECHO) "$(BOOTLOADER_UPLOAD_TOOL) not currently supported!\n\n"
+endif
 
-do_eeprom: $(TARGET_EEP) $(TARGET_HEX)
-	$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) $(AVRDUDE_UPLOAD_EEP)
+do_eeprom:	$(TARGET_EEP) $(TARGET_HEX)
+		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
+			$(AVRDUDE_UPLOAD_EEP)
 
-eeprom:	$(TARGET_HEX) verify_size
-	$(MAKE) reset
-	$(MAKE) do_eeprom
+eeprom:		$(TARGET_HEX) verify_size
+		$(MAKE) reset
+		$(MAKE) do_eeprom
 
 raw_eeprom:	$(TARGET_HEX) verify_size
-	$(MAKE) error_on_caterina
-	$(MAKE) do_eeprom
+		$(MAKE) error_on_caterina
+		$(MAKE) do_eeprom
 
 reset:
-	$(call arduino_output,Resetting Arduino...)
-	$(RESET_CMD)
+		$(call arduino_output,Resetting Arduino...)
+		$(RESET_CMD)
 
 # stty on MacOS likes -F, but on Debian it likes -f redirecting
 # stdin/out appears to work but generates a spurious error on MacOS at
 # least. Perhaps it would be better to just do it in perl ?
 reset_stty:
-	for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \
-		do $$STTYF /dev/tty >/dev/null 2>&1 && break ; \
-	done ; \
-	$$STTYF $(call get_monitor_port)  hupcl ; \
-	(sleep 0.1 2>/dev/null || sleep 1) ; \
-	$$STTYF $(call get_monitor_port) -hupcl
+		for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \
+		  do $$STTYF /dev/tty >/dev/null 2>&1 && break ; \
+		done ; \
+		$$STTYF $(call get_monitor_port)  hupcl ; \
+		(sleep 0.1 2>/dev/null || sleep 1) ; \
+		$$STTYF $(call get_monitor_port) -hupcl
+
+ispload:	$(TARGET_EEP) $(TARGET_HEX) verify_size
+		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e \
+			$(AVRDUDE_ISPLOAD_OPTS)
+
+burn_bootloader:
+ifeq ($(findstring sam, $(strip $(ARCHITECTURE))), sam)
+    ifeq ($(strip $(BOOTLOADER_UPLOAD_TOOL)), openocd)
+				$(OPENOCD) $(OPENOCD_OPTS) -c "telnet_port disabled; init; halt; $(BOOTLOADER_UNPROTECT); program {{$(BOOTLOADER_PARENT)/$(BOOTLOADER_FILE)}} verify reset; shutdown"
+    else
+				@$(ECHO) "$(BOOTLOADER_UPLOAD_TOOL) not currently supported!\n\n"
+    endif
+else
+    ifneq ($(strip $(AVRDUDE_ISP_FUSES_PRE)),)
+				$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e $(AVRDUDE_ISP_FUSES_PRE)
+    endif
+    ifneq ($(strip $(AVRDUDE_ISP_BURN_BOOTLOADER)),)
+				$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) $(AVRDUDE_ISP_BURN_BOOTLOADER)
+    endif
+    ifneq ($(strip $(AVRDUDE_ISP_FUSES_POST)),)
+				$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) $(AVRDUDE_ISP_FUSES_POST)
+    endif
+endif
+
+set_fuses:
+ifneq ($(strip $(AVRDUDE_ISP_FUSES_PRE)),)
+		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) $(AVRDUDE_ISP_FUSES_PRE)
+endif
+ifneq ($(strip $(AVRDUDE_ISP_FUSES_POST)),)
+		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) $(AVRDUDE_ISP_FUSES_POST)
+endif
 
 clean::
-	$(REMOVE) $(OBJDIR)
+		$(REMOVE) $(OBJDIR)
 
-size: $(TARGET_HEX)
-	$(call avr_size,$(TARGET_ELF),$(TARGET_HEX))
+size:	$(TARGET_HEX)
+		$(call avr_size,$(TARGET_ELF),$(TARGET_HEX))
 
 show_boards:
-	@$(CAT) $(BOARDS_TXT) | grep -E '^[a-zA-Z0-9_\-]+.name' | sort -uf | sed 's/.name=/:/' | column -s: -t
+		@$(CAT) $(BOARDS_TXT) | grep -E '^[a-zA-Z0-9_\-]+.name' | sort -uf | sed 's/.name=/:/' | column -s: -t
 
 show_submenu:
 	@$(CAT) $(BOARDS_TXT) | grep -E '[a-zA-Z0-9_\-]+.menu.(cpu|chip).[a-zA-Z0-9_\-]+=' | sort -uf | sed 's/.menu.\(cpu\|chip\)./:/' | sed 's/=/:/' | column -s: -t
 
 monitor:
-ifeq ($(LOG_MONITOR),1)
-	$(MONITOR_CMD) -L -Logfile $(MONITOR_LOG_FILE) $(call get_monitor_port) $(MONITOR_BAUDRATE)
+ifeq ($(notdir $(MONITOR_CMD)), putty)
+ifneq ($(strip $(MONITOR_PARAMS)),)
+	$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE),$(MONITOR_PARAMS) $(call get_monitor_port)
+else
+	$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE) $(call get_monitor_port)
+endif
+else ifeq ($(notdir $(MONITOR_CMD)), picocom)
+		$(MONITOR_CMD) -b $(MONITOR_BAUDRATE) $(MONITOR_PARAMS) $(call get_monitor_port)
+else ifeq ($(notdir $(MONITOR_CMD)), cu)
+		$(MONITOR_CMD) -l $(call get_monitor_port) -s $(MONITOR_BAUDRATE)
 else
-	$(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
+		$(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE)
 endif
 
 debug_init:
@@ -747,10 +1824,10 @@ debug:
 	$(GDB) $(GDB_OPTS)
 
 disasm: $(OBJDIR)/$(TARGET).lss
-	@$(ECHO) "The compiled ELF file has been disassembled to $(OBJDIR)/$(TARGET).lss\n\n"
+		@$(ECHO) "The compiled ELF file has been disassembled to $(OBJDIR)/$(TARGET).lss\n\n"
 
 symbol_sizes: $(OBJDIR)/$(TARGET).sym
-	@$(ECHO) "A symbol listing sorted by their size have been dumped to $(OBJDIR)/$(TARGET).sym\n\n"
+		@$(ECHO) "A symbol listing sorted by their size have been dumped to $(OBJDIR)/$(TARGET).sym\n\n"
 
 verify_size:
 ifeq ($(strip $(HEX_MAXIMUM_SIZE)),)
@@ -760,18 +1837,20 @@ endif
 See http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing it."; false; fi
 
 generate_assembly: $(OBJDIR)/$(TARGET).s
-	@$(ECHO) "Compiler-generated assembly for the main input source has been dumped to $(OBJDIR)/$(TARGET).s\n\n"
+		@$(ECHO) "Compiler-generated assembly for the main input source has been dumped to $(OBJDIR)/$(TARGET).s\n\n"
 
 generated_assembly: generate_assembly
-	@$(ECHO) "\"generated_assembly\" target is deprecated. Use \"generate_assembly\" target instead\n\n"
+		@$(ECHO) "\"generated_assembly\" target is deprecated. Use \"generate_assembly\" target instead\n\n"
 
 tags:
 ifneq ($(words $(wildcard $(TAGS_FILE))), 0)
 	rm -f $(TAGS_FILE)
 endif
+	@$(ECHO) "Generating tags for local sources (INO an PDE files as C++): "
+	$(CTAGS_CMD) $(TAGS_FILE) --langmap=c++:+.ino.pde $(LOCAL_SRCS)
 ifneq ($(words $(ARDUINO_LIBS)), 0)
-	@$(ECHO) "Generating tags for project libraries: "
-	$(CTAGS_CMD) $(TAGS_FILE) $(foreach lib, $(ARDUINO_LIBS),$(PROJ_LIBS_PATH)/$(lib)/*)
+		@$(ECHO) "Generating tags for project libraries: "
+		$(CTAGS_CMD) $(TAGS_FILE) $(foreach lib, $(ARDUINO_LIBS),$(USER_LIB_PATH)/$(lib)/*)
 endif
 	@$(ECHO) "Generating tags for Arduino core: "
 	$(CTAGS_CMD) $(TAGS_FILE) $(ARDUINO_CORE_PATH)/*
@@ -780,12 +1859,13 @@ endif
 	@$(ECHO) "Tag file generation complete, output: $(TAGS_FILE)\n"
 
 help_vars:
-	@$(CAT) $(ARDMK_DIR)/arduino-mk-vars.md
+		@$(CAT) $(ARDMK_DIR)/arduino-mk-vars.md
 
 help:
-	@$(ECHO) "\nAvailable targets:\n\
+		@$(ECHO) "\nAvailable targets:\n\
   make                   - compile the code\n\
   make upload            - upload\n\
+  make ispload           - upload using an ISP\n\
   make raw_upload        - upload without first resetting\n\
   make eeprom            - upload the eep file\n\
   make raw_eeprom        - upload the eep file without first resetting\n\
@@ -809,15 +1889,17 @@ help:
                            original source code.\n\
   make generate_assembly - generate a .s file containing the compiler\n\
                            generated assembly of the main sketch.\n\
+  make burn_bootloader   - burn bootloader and fuses\n\
+  make set_fuses         - set fuses without burning bootloader\n\
   make tags              - generate tags file including project libs and Arduino core\n\
   make help_vars         - print all variables that can be overridden\n\
   make help              - show this help\n\
 "
 	@$(ECHO) "Please refer to $(ARDMK_DIR)/Arduino.mk for more details.\n"
 
-.PHONY: all upload raw_upload raw_eeprom error_on_caterina reset reset_stty \
+.PHONY: all upload raw_upload raw_eeprom error_on_caterina reset reset_stty ispload \
         clean depends size show_boards monitor disasm symbol_sizes generated_assembly \
-        generate_assembly verify_size help pre-build tags debug debug_init
+        generate_assembly verify_size burn_bootloader help pre-build tags debug debug_init
 
 # added - in the beginning, so that we don't get an error if the file is not present
 -include $(DEPS)
diff --git a/make-scripts/Common.mk b/make-scripts/Common.mk
index fa3f9f0..decb19d 100644
--- a/make-scripts/Common.mk
+++ b/make-scripts/Common.mk
@@ -68,6 +68,31 @@ endif
 $(call show_config_variable,CURRENT_OS,[AUTODETECTED])
 
 ########################################################################
+#
+# Travis-CI
+ifneq ($(TEST),)
+       DEPENDENCIES_DIR = /var/tmp/Arduino-Makefile-testing-dependencies
+
+       DEPENDENCIES_MPIDE_DIR := $(shell find $(DEPENDENCIES_DIR) -name 'mpide-0023-*' -type d -exec ls -dt {} + | head -n 1)
+
+       ifeq ($(MPIDE_DIR),)
+              MPIDE_DIR = $(DEPENDENCIES_MPIDE_DIR)
+       endif
+
+       ifndef ARDUINO_IDE_DIR
+              ifeq ($(CURRENT_OS),MAC)
+                  ARDUINO_IDE_DIR = Arduino.app/Contents/Resources/Java
+              else
+                  ARDUINO_IDE_DIR := $(shell basename $(basename $(basename $(lastword $(wildcard $(DEPENDENCIES_DIR)/arduino*)))))
+              endif
+       endif
+       DEPENDENCIES_ARDUINO_DIR = $(DEPENDENCIES_DIR)/$(ARDUINO_IDE_DIR)
+       ifeq ($(ARDUINO_DIR),)
+              ARDUINO_DIR = $(DEPENDENCIES_ARDUINO_DIR)
+       endif
+endif
+
+########################################################################
 # Arduino Directory
 
 ifndef ARDUINO_DIR
@@ -85,23 +110,19 @@ else
     $(call show_config_variable,ARDUINO_DIR,[USER])
 endif
 
+ifeq ($(CURRENT_OS),WINDOWS)
+		ifneq ($(shell echo $(ARDUINO_DIR) | egrep '\\|[[:space:]]|cygdrive'),)
+        echo $(error On Windows, ARDUINO_DIR and other defines must use forward slash and not contain spaces, special characters or be cygdrive relative)
+    endif
+endif
+
 ########################################################################
 # System Python
 
 ifndef PYTHON_CMD
     # try for Python 3 first
-    PYTHON_CMD := $(shell which python3 2> /dev/null)
-    ifdef PYTHON_CMD
-        $(call show_config_variable,PYTHON_CMD,[AUTODETECTED])
-    else
-        # fall-back to any Python
-        PYTHON_CMD := $(shell which python 2> /dev/null)
-        ifdef PYTHON_CMD
-            $(call show_config_variable,PYTHON_CMD,[AUTODETECTED])
-        else
-            echo $(error "Unable to find system Python! Utility scipts won't work. Override this error by defining PYTHON_CMD")
-        endif
-    endif
+    PYTHON_CMD := python3.9 #.exe
+    $(call show_config_variable,PYTHON_CMD,[AUTODETECTED])
 else
     $(call show_config_variable,PYTHON_CMD,[USER])
 endif
diff --git a/make-scripts/license.txt b/make-scripts/licence.txt
index 4362b49..4362b49 100644
--- a/make-scripts/license.txt
+++ b/make-scripts/licence.txt