~ruther/qmk_firmware

44fd317a8793753b2af1bab8e4a4700024a768a5 — Drashna Jaelre 6 years ago 0728c0f
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>
3 files changed, 4 insertions(+), 3 deletions(-)

M message.mk
M tmk_core/avr.mk
M tmk_core/chibios.mk
M message.mk => message.mk +1 -0
@@ 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

M tmk_core/avr.mk => tmk_core/avr.mk +2 -2
@@ 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

M tmk_core/chibios.mk => tmk_core/chibios.mk +1 -1
@@ 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