diff options
Diffstat (limited to 'tmk_core/avr.mk')
| -rw-r--r-- | tmk_core/avr.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 521305f1b..eb934ffe6 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk | |||
| @@ -113,10 +113,16 @@ define EXEC_DFU | |||
| 113 | if [ "$(1)" ]; then \ | 113 | if [ "$(1)" ]; then \ |
| 114 | echo "Flashing '$(1)' for EE_HANDS split keyboard support." ;\ | 114 | echo "Flashing '$(1)' for EE_HANDS split keyboard support." ;\ |
| 115 | fi; \ | 115 | fi; \ |
| 116 | until $(DFU_PROGRAMMER) $(MCU) get bootloader-version; do\ | 116 | if ! $(DFU_PROGRAMMER) $(MCU) get bootloader-version >/dev/null 2>/dev/null; then\ |
| 117 | printf "$(MSG_BOOTLOADER_NOT_FOUND)" ;\ | 117 | printf "$(MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY)" ;\ |
| 118 | sleep 5 ;\ | 118 | sleep $(BOOTLOADER_RETRY_TIME) ;\ |
| 119 | done; \ | 119 | while ! $(DFU_PROGRAMMER) $(MCU) get bootloader-version >/dev/null 2>/dev/null; do\ |
| 120 | printf "." ;\ | ||
| 121 | sleep $(BOOTLOADER_RETRY_TIME) ;\ | ||
| 122 | done ;\ | ||
| 123 | printf "\n" ;\ | ||
| 124 | fi; \ | ||
| 125 | $(DFU_PROGRAMMER) $(MCU) get bootloader-version ;\ | ||
| 120 | if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\ | 126 | if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\ |
| 121 | $(DFU_PROGRAMMER) $(MCU) erase --force; \ | 127 | $(DFU_PROGRAMMER) $(MCU) erase --force; \ |
| 122 | if [ "$(1)" ]; then \ | 128 | if [ "$(1)" ]; then \ |
| @@ -172,7 +178,7 @@ define EXEC_AVRDUDE | |||
| 172 | TMP2=`mktemp`; \ | 178 | TMP2=`mktemp`; \ |
| 173 | list_devices > $$TMP1; \ | 179 | list_devices > $$TMP1; \ |
| 174 | while [ -z "$$USB" ]; do \ | 180 | while [ -z "$$USB" ]; do \ |
| 175 | sleep 0.5; \ | 181 | sleep $(BOOTLOADER_RETRY_TIME); \ |
| 176 | printf "."; \ | 182 | printf "."; \ |
| 177 | list_devices > $$TMP2; \ | 183 | list_devices > $$TMP2; \ |
| 178 | USB=`comm -13 $$TMP1 $$TMP2 | $(GREP) -o '/dev/tty.*'`; \ | 184 | USB=`comm -13 $$TMP1 $$TMP2 | $(GREP) -o '/dev/tty.*'`; \ |
| @@ -187,7 +193,7 @@ define EXEC_AVRDUDE | |||
| 187 | sleep 1; \ | 193 | sleep 1; \ |
| 188 | else \ | 194 | else \ |
| 189 | printf "Waiting for $$USB to become writable."; \ | 195 | printf "Waiting for $$USB to become writable."; \ |
| 190 | while [ ! -w "$$USB" ]; do sleep 0.5; printf "."; done; echo ""; \ | 196 | while [ ! -w "$$USB" ]; do sleep $(BOOTLOADER_RETRY_TIME); printf "."; done; echo ""; \ |
| 191 | fi; \ | 197 | fi; \ |
| 192 | if [ -z "$(1)" ]; then \ | 198 | if [ -z "$(1)" ]; then \ |
| 193 | $(AVRDUDE_PROGRAMMER) -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex; \ | 199 | $(AVRDUDE_PROGRAMMER) -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex; \ |