Skip to content

Commit

Permalink
Actually use correct bootloader not found message (qmk#6695)
Browse files Browse the repository at this point in the history
  • Loading branch information
drashna authored and fauxpark committed Sep 7, 2019
1 parent 44fd317 commit 02f77e7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions tmk_core/avr.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tmk_core/chibios.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 02f77e7

Please sign in to comment.