Merge branch 'master' of https://github.com/sudar/Arduino-Makefile into HEAD

Arduino.mk

@@ -1792,11 +1792,11 @@ show_submenu:
 
 monitor:
 ifeq ($(notdir $(MONITOR_CMD)), putty)
-	ifneq ($(strip $(MONITOR_PARAMS)),)
+ifneq ($(strip $(MONITOR_PARAMS)),)
 	$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE),$(MONITOR_PARAMS) $(call get_monitor_port)
-	else
+else
 	$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE) $(call get_monitor_port)
-	endif
+endif
 else ifeq ($(notdir $(MONITOR_CMD)), picocom)
 		$(MONITOR_CMD) -b $(MONITOR_BAUDRATE) $(MONITOR_PARAMS) $(call get_monitor_port)
 else ifeq ($(notdir $(MONITOR_CMD)), cu)

HISTORY.md

@@ -44,6 +44,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
 - New: Add support for good old cu as monitor command (issue #492) (https://github.com/mwm)
 - New: Add a documentation how to setup Makefile for 3rd party boards (issue #499). (https://github.com/MilanV)
 - New: Add support for Robotis OpenCM boards
+- Fix: Syntax of inner conditional statements of monitor command evaluated when MONITOR_CMD = putty
 
 ### 1.5.2 (2017-01-11)
 

README.md

@@ -131,7 +131,7 @@ sudo port install py27-serial
 
 On Windows:
 
-You need to install Cygwin and its packages for Make, Perl and the following Serial library.
+You need to install Cygwin and its packages for Make, Perl, Python2 and the following Serial library.
 
 Assuming you included Python in your Cygwin installation:
 
@@ -226,7 +226,7 @@ On Windows (using MSYS and PuTTY), you might want to set the following extra par
 
 ```make
     MONITOR_CMD   = putty
-    MONITOR_PARMS = 8,1,n,N
+    MONITOR_PARAMS = 8,1,n,N
 ```
 
 On Arduino 1.5+ installs, you should set the architecture to either `avr` or `sam` and if using a submenu CPU type, then also set that:

arduino-mk-vars.md

@@ -1268,6 +1268,24 @@ MONITOR_CMD = minicom
 
 ----
 
+### MONITOR_PARAMS
+
+**Description:**
+
+Additional parameters for the putty -sercfg command line argument.
+
+Interpreted as a comma-separated list of configuration options.
+
+**Example:**
+
+```Makefile
+MONITOR_PARAMS = 8,1,n,N
+```
+
+**Requirement:** *Optional*
+
+----
+
 ### PRE_BUILD_HOOK
 
 **Description:**