summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2021-07-03 16:38:05 +1000
committerfauxpark <fauxpark@gmail.com>2021-07-03 16:38:05 +1000
commit03807c2c6e470a3046c1ff40ac7ab74f76b94f74 (patch)
tree41b605163e5c7b9726128d267e310024bc46fcfc /tmk_core
parent7629b7f52a89be171c6427ad2849d50ccd347335 (diff)
parent06e0643541493220fb7413e33f3fc6972a9384b8 (diff)
downloadqmk_firmware-03807c2c6e470a3046c1ff40ac7ab74f76b94f74.tar.gz
qmk_firmware-03807c2c6e470a3046c1ff40ac7ab74f76b94f74.zip
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/avr.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index b787e77ece..2efde22127 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -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; \