From 524053e3c0eceab0eadf04cde6c2c0f1a77520fe Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Wed, 28 Feb 2018 16:40:43 -0500
Subject: Remap msys2 usb, fix USB port detection (#2301)

* Add AVRDUDE to MSYS2 setup

* Remap detected USB port in MSYS2 to COM port
---
 tmk_core/avr.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tmk_core')

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 106b77150..853b8f02f 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -183,6 +183,10 @@ avrdude: $(BUILD_DIR)/$(TARGET).hex check-size
 		done; \
 		echo ""; \
 		echo "Detected controller on USB port at $$USB"; \
+		if grep -q -s 'MINGW\|MSYS' /proc/version; then \
+			USB=`echo "$$USB" | perl -pne 's/\/dev\/ttyS(\d+)/COM.($$1+1)/e'`; \
+			echo "Remapped MSYS2 USB port to $$USB"; \
+		fi; \
 		sleep 1; \
 		avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex; \
 	fi
-- 
cgit v1.2.3-24-g4f1b