gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-26 05:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
QMK Bot 2021-05-05 23:27:27 +00:00
commit 45f710f3ff
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmk_core/avr.mk
View File

@ -160,6 +160,8 @@ define EXEC_AVRDUDE
list_devices() { \ list_devices() { \
if $(GREP) -q -s icrosoft /proc/version; then \ if $(GREP) -q -s icrosoft /proc/version; then \
wmic.exe path Win32_SerialPort get DeviceID 2>/dev/null | LANG=C perl -pne 's/COM(\d+)/COM.($$1-1)/e' | sed 's!COM!/dev/ttyS!' | xargs echo -n | sort; \ wmic.exe path Win32_SerialPort get DeviceID 2>/dev/null | LANG=C perl -pne 's/COM(\d+)/COM.($$1-1)/e' | sed 's!COM!/dev/ttyS!' | xargs echo -n | sort; \
elif [ "`uname`" = "FreeBSD" ]; then \
ls /dev/tty* | grep -v '\.lock$$' | grep -v '\.init$$'; \
else \ else \
ls /dev/tty*; \ ls /dev/tty*; \
fi; \ fi; \
@ -169,7 +171,7 @@ define EXEC_AVRDUDE
TMP1=`mktemp`; \ TMP1=`mktemp`; \
TMP2=`mktemp`; \ TMP2=`mktemp`; \
list_devices > $$TMP1; \ list_devices > $$TMP1; \
while [ -z $$USB ]; do \ while [ -z "$$USB" ]; do \
sleep 0.5; \ sleep 0.5; \
printf "."; \ printf "."; \
list_devices > $$TMP2; \ list_devices > $$TMP2; \