diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-09-07 09:06:39 -0700 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2019-09-08 02:06:39 +1000 |
| commit | 44fd317a8793753b2af1bab8e4a4700024a768a5 (patch) | |
| tree | 62bf14c1bf3392d122912a1ebab6a39a75705d87 | |
| parent | 0728c0fa4eec9999a4b1268aa6196d7a4c31e721 (diff) | |
| download | qmk_firmware-44fd317a8793753b2af1bab8e4a4700024a768a5.tar.gz qmk_firmware-44fd317a8793753b2af1bab8e4a4700024a768a5.zip | |
Move Bootloader not found message to global variable (#6688)
* Move Bootloader not found message to global variable
* Apply suggestions from code review
Co-Authored-By: fauxpark <fauxpark@gmail.com>
| -rw-r--r-- | message.mk | 1 | ||||
| -rw-r--r-- | tmk_core/avr.mk | 4 | ||||
| -rw-r--r-- | tmk_core/chibios.mk | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/message.mk b/message.mk index c8d2135d5c..dfbde2845b 100644 --- a/message.mk +++ b/message.mk @@ -87,3 +87,4 @@ MSG_PYTHON_MISSING = $(WARN_COLOR)WARNING:$(NO_COLOR)\n \ 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 diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 775f2a996d..40dcdc3f68 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -147,7 +147,7 @@ define EXEC_DFU echo "Flashing '$(1)' for EE_HANDS split keyboard support." ;\ fi; \ until $(DFU_PROGRAMMER) $(MCU) get bootloader-version; do\ - echo "Error: Bootloader not found. Trying again in 5s." ;\ + printf "$(MSG_FLASH_BOOTLOADER)" ;\ sleep 5 ;\ done; \ if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\ @@ -252,7 +252,7 @@ define EXEC_BOOTLOADHID # bootloadHid executable has no cross platform detect methods # so keep running bootloadHid if the output contains "The specified device was not found" until $(BOOTLOADHID_PROGRAMMER) -r $(BUILD_DIR)/$(TARGET).hex 2>&1 | tee /dev/stderr | grep -v "device was not found"; do\ - echo "Error: Bootloader not found. Trying again in 5s." ;\ + printf "$(MSG_FLASH_BOOTLOADER)" ;\ sleep 5 ;\ done endef diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 4b5b6d00b5..5c757ec899 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -236,7 +236,7 @@ qmk: $(BUILD_DIR)/$(TARGET).bin define EXEC_DFU_UTIL until $(DFU_UTIL) -l | grep -q "Found DFU"; do\ - echo "Error: Bootloader not found. Trying again in 5s." ;\ + printf "$(MSG_FLASH_BOOTLOADER)" ;\ sleep 5 ;\ done $(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin |