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>

diff --git a/message.mk b/message.mk
index c8d2135..dfbde28 100644 (file)
--- 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 775f2a9..40dcdc3 100644 (file)
--- 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 4b5b6d0..5c757ec 100644 (file)
--- 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