diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-09-07 16:55:18 -0700 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2019-09-08 09:55:18 +1000 |
| commit | 02f77e7215a0ee9bb4ba1054dbdec75a4843bb99 (patch) | |
| tree | da2aa27fe20789764ceecad4d57652b6a192486b /tmk_core | |
| parent | 44fd317a8793753b2af1bab8e4a4700024a768a5 (diff) | |
| download | qmk_firmware-02f77e7215a0ee9bb4ba1054dbdec75a4843bb99.tar.gz qmk_firmware-02f77e7215a0ee9bb4ba1054dbdec75a4843bb99.zip | |
Actually use correct bootloader not found message (#6695)
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 4 | ||||
| -rw-r--r-- | tmk_core/chibios.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 40dcdc3f6..1846a9b4b 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk | |||
| @@ -147,7 +147,7 @@ define EXEC_DFU | |||
| 147 | echo "Flashing '$(1)' for EE_HANDS split keyboard support." ;\ | 147 | echo "Flashing '$(1)' for EE_HANDS split keyboard support." ;\ |
| 148 | fi; \ | 148 | fi; \ |
| 149 | until $(DFU_PROGRAMMER) $(MCU) get bootloader-version; do\ | 149 | until $(DFU_PROGRAMMER) $(MCU) get bootloader-version; do\ |
| 150 | printf "$(MSG_FLASH_BOOTLOADER)" ;\ | 150 | printf "$(MSG_BOOTLOADER_NOT_FOUND)" ;\ |
| 151 | sleep 5 ;\ | 151 | sleep 5 ;\ |
| 152 | done; \ | 152 | done; \ |
| 153 | if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\ | 153 | if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\ |
| @@ -252,7 +252,7 @@ define EXEC_BOOTLOADHID | |||
| 252 | # bootloadHid executable has no cross platform detect methods | 252 | # bootloadHid executable has no cross platform detect methods |
| 253 | # so keep running bootloadHid if the output contains "The specified device was not found" | 253 | # so keep running bootloadHid if the output contains "The specified device was not found" |
| 254 | until $(BOOTLOADHID_PROGRAMMER) -r $(BUILD_DIR)/$(TARGET).hex 2>&1 | tee /dev/stderr | grep -v "device was not found"; do\ | 254 | until $(BOOTLOADHID_PROGRAMMER) -r $(BUILD_DIR)/$(TARGET).hex 2>&1 | tee /dev/stderr | grep -v "device was not found"; do\ |
| 255 | printf "$(MSG_FLASH_BOOTLOADER)" ;\ | 255 | printf "$(MSG_BOOTLOADER_NOT_FOUND)" ;\ |
| 256 | sleep 5 ;\ | 256 | sleep 5 ;\ |
| 257 | done | 257 | done |
| 258 | endef | 258 | endef |
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 5c757ec89..c25e28707 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk | |||
| @@ -236,7 +236,7 @@ qmk: $(BUILD_DIR)/$(TARGET).bin | |||
| 236 | 236 | ||
| 237 | define EXEC_DFU_UTIL | 237 | define EXEC_DFU_UTIL |
| 238 | until $(DFU_UTIL) -l | grep -q "Found DFU"; do\ | 238 | until $(DFU_UTIL) -l | grep -q "Found DFU"; do\ |
| 239 | printf "$(MSG_FLASH_BOOTLOADER)" ;\ | 239 | printf "$(MSG_BOOTLOADER_NOT_FOUND)" ;\ |
| 240 | sleep 5 ;\ | 240 | sleep 5 ;\ |
| 241 | done | 241 | done |
| 242 | $(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin | 242 | $(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin |