aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hagelberg <phil@hagelb.org>2017-10-16 09:01:43 -0700
committerJack Humbert <jack.humb@gmail.com>2017-10-16 09:54:17 -1000
commit0f5928fdf4399f14a500a00936a2cc35225cd3bf (patch)
tree00d5f413ce5a7462b4dde40b1844fb0a06f28eed
parentba4b3d9d7275e8f4280044d959a267e2abcec8e7 (diff)
downloadqmk_firmware-0f5928fdf4399f14a500a00936a2cc35225cd3bf.tar.gz
qmk_firmware-0f5928fdf4399f14a500a00936a2cc35225cd3bf.zip
Fix avrdude message to not mention any specific device model.
-rw-r--r--tmk_core/avr.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 989180f3c..0e014a412 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -146,10 +146,10 @@ dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
146 146
147avrdude: $(BUILD_DIR)/$(TARGET).hex 147avrdude: $(BUILD_DIR)/$(TARGET).hex
148 if grep -q -s Microsoft /proc/version; then \ 148 if grep -q -s Microsoft /proc/version; then \
149 echo 'ERROR: Pro Micros can not be flashed within the Windows Subsystem for Linux (WSL) currently. Instead, take the .hex file generated and flash it using AVRDUDE, AVRDUDESS, or XLoader.'; \ 149 echo 'ERROR: AVR flashing cannot be automated within the Windows Subsystem for Linux (WSL) currently. Instead, take the .hex file generated and flash it using AVRDUDE, AVRDUDESS, or XLoader.'; \
150 else \ 150 else \
151 ls /dev/tty* > /tmp/1; \ 151 ls /dev/tty* > /tmp/1; \
152 echo "Detecting Pro Micro port, reset your Pro Micro now.\c"; \ 152 echo "Detecting USB port, reset your controller now.\c"; \
153 while [ -z $$USB ]; do \ 153 while [ -z $$USB ]; do \
154 sleep 1; \ 154 sleep 1; \
155 echo ".\c"; \ 155 echo ".\c"; \
@@ -157,7 +157,7 @@ avrdude: $(BUILD_DIR)/$(TARGET).hex
157 USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \ 157 USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
158 done; \ 158 done; \
159 echo ""; \ 159 echo ""; \
160 echo "Detected Pro Micro port at $$USB"; \ 160 echo "Detected controller on USB port at $$USB"; \
161 sleep 1; \ 161 sleep 1; \
162 avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex; \ 162 avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex; \
163 fi 163 fi