Browse Source

Add "Ctrl+C to cancel" to "waiting for bootloader" messages (#13424)

pull/13427/head 0.13.17
Ryan 2 years ago
committed by GitHub
parent
commit
06e0643541
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      message.mk
  2. +1
    -1
      tmk_core/avr.mk

+ 2
- 2
message.mk View File

@ -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)

+ 1
- 1
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; \


Loading…
Cancel
Save