dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #613 from TaylorZowtuk/master

Browse source 
Fixed syntax error of make monitor on windows/cygwin
This commit is contained in:
Simon John 2019-08-25 15:18:09 +01:00 committed by GitHub
commit e870443f48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Arduino.mk
View file

@ -1792,11 +1792,11 @@ show_submenu:
monitor: monitor:
ifeq ($(notdir $(MONITOR_CMD)), putty) 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) $(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE),$(MONITOR_PARAMS) $(call get_monitor_port)
else else
$(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE) $(call get_monitor_port) $(MONITOR_CMD) -serial -sercfg $(MONITOR_BAUDRATE) $(call get_monitor_port)
endif endif
else ifeq ($(notdir $(MONITOR_CMD)), picocom) else ifeq ($(notdir $(MONITOR_CMD)), picocom)
$(MONITOR_CMD) -b $(MONITOR_BAUDRATE) $(MONITOR_PARAMS) $(call get_monitor_port) $(MONITOR_CMD) -b $(MONITOR_BAUDRATE) $(MONITOR_PARAMS) $(call get_monitor_port)
else ifeq ($(notdir $(MONITOR_CMD)), cu) else ifeq ($(notdir $(MONITOR_CMD)), cu)

1
HISTORY.md
View file

@ -43,6 +43,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 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 a documentation how to setup Makefile for 3rd party boards (issue #499). (https://github.com/MilanV)
- New: Add support for Robotis OpenCM boards - 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) ### 1.5.2 (2017-01-11)

4
README.md
View file

@ -131,7 +131,7 @@ sudo port install py27-serial
On Windows: 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: 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 ```make
MONITOR_CMD = putty 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: 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:

18
arduino-mk-vars.md
View file

@ -1249,6 +1249,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 ### PRE_BUILD_HOOK
**Description:** **Description:**