From 02f77e7215a0ee9bb4ba1054dbdec75a4843bb99 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 7 Sep 2019 16:55:18 -0700 Subject: [PATCH] Actually use correct bootloader not found message (#6695) --- tmk_core/avr.mk | 4 ++-- tmk_core/chibios.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 40dcdc3f68..1846a9b4bc 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\ - printf "$(MSG_FLASH_BOOTLOADER)" ;\ + printf "$(MSG_BOOTLOADER_NOT_FOUND)" ;\ 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\ - printf "$(MSG_FLASH_BOOTLOADER)" ;\ + printf "$(MSG_BOOTLOADER_NOT_FOUND)" ;\ sleep 5 ;\ done endef diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 5c757ec899..c25e287071 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\ - printf "$(MSG_FLASH_BOOTLOADER)" ;\ + printf "$(MSG_BOOTLOADER_NOT_FOUND)" ;\ sleep 5 ;\ done $(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin