drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

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

Browse source
This commit is contained in:
fauxpark 2021-07-03 16:38:05 +10:00
commit 03807c2c6e
41 changed files with 2281 additions and 554 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tmk_core/avr.mk
View file

@ -173,7 +173,7 @@ define EXEC_AVRDUDE
fi; \
}; \
USB= ;\
printf "Detecting USB port, reset your controller now."; \
printf "Waiting for USB serial port - reset your controller now (Ctrl+C to cancel)"; \
TMP1=`mktemp`; \
TMP2=`mktemp`; \
list_devices > $$TMP1; \