Skip to content

Commit

Permalink
Add "Ctrl+C to cancel" to "waiting for bootloader" messages (qmk#13424)
Browse files Browse the repository at this point in the history
  • Loading branch information
fauxpark authored Jul 3, 2021
1 parent 2ce8d26 commit 06e0643
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions message.mk
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@ MSG_PYTHON_MISSING = $(ERROR_COLOR)ERROR:$(NO_COLOR) Can not run \"qmk\" command
Please run $(BOLD)util/qmk_install.sh$(NO_COLOR) to install all the dependencies QMK requires.\n\n
MSG_FLASH_BOOTLOADER = $(WARN_COLOR)WARNING:$(NO_COLOR) This board's bootloader is not specified or is not supported by the \":flash\" target at this time.\n\n
MSG_FLASH_ARCH = $(WARN_COLOR)WARNING:$(NO_COLOR) This board's architecture is not supported by the \":flash\" target at this time.\n\n
MSG_BOOTLOADER_NOT_FOUND = $(ERROR_COLOR)ERROR:$(NO_COLOR) Bootloader not found. Trying again in 5s.\n
MSG_BOOTLOADER_NOT_FOUND = $(ERROR_COLOR)ERROR:$(NO_COLOR) Bootloader not found. Trying again in 5s (Ctrl+C to cancel)\n
BOOTLOADER_RETRY_TIME ?= 0.5
MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = Bootloader not found. Trying again every $(BOOTLOADER_RETRY_TIME)s
MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = Bootloader not found. Trying again every $(BOOTLOADER_RETRY_TIME)s (Ctrl+C to cancel)
2 changes: 1 addition & 1 deletion tmk_core/avr.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down

0 comments on commit 06e0643

Please sign in to comment.