localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity

Remap msys2 usb, fix USB port detection (#2301) 

* Add AVRDUDE to MSYS2 setup

* Remap detected USB port in MSYS2 to COM port
This commit is contained in:
Danny 2018-02-28 16:40:43 -05:00 committed by Jack Humbert
parent 19b02bf267
commit 524053e3c0
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmk_core/avr.mk
View File

@ -183,6 +183,10 @@ avrdude: $(BUILD_DIR)/$(TARGET).hex check-size
done; \ done; \
echo ""; \ echo ""; \
echo "Detected controller on USB port at $$USB"; \ 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; \ sleep 1; \
avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex; \ avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex; \
fi fi

1
util/msys2_install.sh
View File

@ -16,6 +16,7 @@ function install_avr {
wget "http://ww1.microchip.com/downloads/en/DeviceDoc/avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe" wget "http://ww1.microchip.com/downloads/en/DeviceDoc/avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe"
7z x avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe 7z x avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe
rm avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe rm avr8-gnu-toolchain-installer-3.5.4.91-win32.any.x86.exe
pacman --needed -S mingw-w64-x86_64-avrdude
} }
function install_arm { function install_arm {