diff options
| author | John Whittington <git@jbrengineering.co.uk> | 2020-08-05 18:22:29 +0200 |
|---|---|---|
| committer | John Whittington <git@jbrengineering.co.uk> | 2020-08-05 18:22:29 +0200 |
| commit | 517fe4a632b57a6c4ee2754bbb06470055427a5e (patch) | |
| tree | 982ca56447615221c9a66de551cb2f79e4fc973d /Arduino.mk | |
| parent | 26e34cd6f2471f04ba097001a215caed12a8574a (diff) | |
| parent | 88dc641c8d582f28243141052517fe03e92e6687 (diff) | |
Merge remote-tracking branch 'sej7278/python3'
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -853,15 +853,15 @@ endif # Reset ifndef RESET_CMD - ARD_RESET_ARDUINO := $(shell which ard-reset-arduino 2> /dev/null) + ARD_RESET_ARDUINO := $(PYTHON_CMD) $(shell which ard-reset-arduino 2> /dev/null) ifndef ARD_RESET_ARDUINO # same level as *.mk in bin directory when checked out from git # or in $PATH when packaged - ARD_RESET_ARDUINO = $(ARDMK_DIR)/bin/ard-reset-arduino + ARD_RESET_ARDUINO = $(PYTHON_CMD) $(ARDMK_DIR)/bin/ard-reset-arduino endif 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 ($(shell which python),/usr/bin/python) + ifeq ($(PYTHON_CMD),/usr/bin/python) RESET_CMD = $(ARD_RESET_ARDUINO) $(ARD_RESET_OPTS) $(DEVICE_PATH) else RESET_CMD = $(ARD_RESET_ARDUINO) $(ARD_RESET_OPTS) $(call get_monitor_port) |