summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-09-07 16:55:18 -0700
committerFlorian Didron <fdidron@users.noreply.github.com>2019-09-26 10:08:39 +0900
commit200c6bedd191a16ac87ce5b18a785e93b01a7d38 (patch)
treef7d7305fe968ee7f6850272bcc7b79b57dd632eb
parent04923788728d33a27bfa4841d4bd7e67463c4c6c (diff)
Actually use correct bootloader not found message (#6695)
-rw-r--r--tmk_core/avr.mk4
-rw-r--r--tmk_core/chibios.mk2
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