diff options
| author | Ryan <fauxpark@gmail.com> | 2021-07-03 16:34:22 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 16:34:22 +1000 |
| commit | 06e0643541493220fb7413e33f3fc6972a9384b8 (patch) | |
| tree | 2cef1e856ca3bbaf49bfe472333914dd9e49c0ec | |
| parent | 2ce8d264184e053d67e083ab86a2613a4a6a128e (diff) | |
| download | qmk_firmware-06e0643541493220fb7413e33f3fc6972a9384b8.tar.gz qmk_firmware-06e0643541493220fb7413e33f3fc6972a9384b8.zip | |
Add "Ctrl+C to cancel" to "waiting for bootloader" messages (#13424)
| -rw-r--r-- | message.mk | 4 | ||||
| -rw-r--r-- | tmk_core/avr.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/message.mk b/message.mk index da5f9fb9e..f4a246894 100644 --- a/message.mk +++ b/message.mk | |||
| @@ -92,6 +92,6 @@ MSG_PYTHON_MISSING = $(ERROR_COLOR)ERROR:$(NO_COLOR) Can not run \"qmk\" command | |||
| 92 | Please run $(BOLD)util/qmk_install.sh$(NO_COLOR) to install all the dependencies QMK requires.\n\n | 92 | Please run $(BOLD)util/qmk_install.sh$(NO_COLOR) to install all the dependencies QMK requires.\n\n |
| 93 | 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 | 93 | 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 |
| 94 | MSG_FLASH_ARCH = $(WARN_COLOR)WARNING:$(NO_COLOR) This board's architecture is not supported by the \":flash\" target at this time.\n\n | 94 | MSG_FLASH_ARCH = $(WARN_COLOR)WARNING:$(NO_COLOR) This board's architecture is not supported by the \":flash\" target at this time.\n\n |
| 95 | MSG_BOOTLOADER_NOT_FOUND = $(ERROR_COLOR)ERROR:$(NO_COLOR) Bootloader not found. Trying again in 5s.\n | 95 | MSG_BOOTLOADER_NOT_FOUND = $(ERROR_COLOR)ERROR:$(NO_COLOR) Bootloader not found. Trying again in 5s (Ctrl+C to cancel)\n |
| 96 | BOOTLOADER_RETRY_TIME ?= 0.5 | 96 | BOOTLOADER_RETRY_TIME ?= 0.5 |
| 97 | MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = Bootloader not found. Trying again every $(BOOTLOADER_RETRY_TIME)s | 97 | MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = Bootloader not found. Trying again every $(BOOTLOADER_RETRY_TIME)s (Ctrl+C to cancel) |
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index eb934ffe6..690154535 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk | |||
| @@ -173,7 +173,7 @@ define EXEC_AVRDUDE | |||
| 173 | fi; \ | 173 | fi; \ |
| 174 | }; \ | 174 | }; \ |
| 175 | USB= ;\ | 175 | USB= ;\ |
| 176 | printf "Detecting USB port, reset your controller now."; \ | 176 | printf "Waiting for USB serial port - reset your controller now (Ctrl+C to cancel)"; \ |
| 177 | TMP1=`mktemp`; \ | 177 | TMP1=`mktemp`; \ |
| 178 | TMP2=`mktemp`; \ | 178 | TMP2=`mktemp`; \ |
| 179 | list_devices > $$TMP1; \ | 179 | list_devices > $$TMP1; \ |