~ruther/qmk_firmware

02f77e7215a0ee9bb4ba1054dbdec75a4843bb99 — Drashna Jaelre 6 years ago 44fd317
Actually use correct bootloader not found message (#6695)

2 files changed, 3 insertions(+), 3 deletions(-)

M tmk_core/avr.mk
M tmk_core/chibios.mk
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\
		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

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\
		printf "$(MSG_FLASH_BOOTLOADER)" ;\
		printf "$(MSG_BOOTLOADER_NOT_FOUND)" ;\
		sleep 5 ;\
	done
	$(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin