From 4519be5bac8d90ce2964595dc7df7ca9434e0207 Mon Sep 17 00:00:00 2001
From: John Whittington <john.whittington@cruxproductdesign.com>
Date: Tue, 5 Sep 2017 14:18:03 +0100
Subject: [PATCH] Detect Cygwin Python or user installed Windows Python and use
 according device port

---
 Arduino.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Arduino.mk b/Arduino.mk
index c83ad0d..0b4ed61 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -744,13 +744,23 @@ ifndef RESET_CMD
 	endif
     ifneq ($(CATERINA),)
         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)
             RESET_CMD = $(ARD_RESET_ARDUINO) --caterina $(ARD_RESET_OPTS) $(DEVICE_PATH)
+          else
+            RESET_CMD = $(ARD_RESET_ARDUINO) --caterina $(ARD_RESET_OPTS) $(call get_monitor_port)
+          endif
         else
             RESET_CMD = $(ARD_RESET_ARDUINO) --caterina $(ARD_RESET_OPTS) $(call get_monitor_port)
         endif
     else
         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)
             RESET_CMD = $(ARD_RESET_ARDUINO) $(ARD_RESET_OPTS) $(DEVICE_PATH)
+          else
+            RESET_CMD = $(ARD_RESET_ARDUINO) $(ARD_RESET_OPTS) $(call get_monitor_port)
+          endif
         else
             RESET_CMD = $(ARD_RESET_ARDUINO) $(ARD_RESET_OPTS) $(call get_monitor_port)
         endif