qmk

Unnamed repository; edit this file 'description' to name the repository.
git clone git://git.z3bra.org/qmk.git
Log | Files | Refs | Submodules | LICENSE

commit 0f5928fdf4399f14a500a00936a2cc35225cd3bf
parent ba4b3d9d7275e8f4280044d959a267e2abcec8e7
Author: Phil Hagelberg <phil@hagelb.org>
Date:   Mon, 16 Oct 2017 09:01:43 -0700

Fix avrdude message to not mention any specific device model.

Diffstat:
tmk_core/avr.mk | 6+++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk @@ -146,10 +146,10 @@ dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep avrdude: $(BUILD_DIR)/$(TARGET).hex if grep -q -s Microsoft /proc/version; then \ - 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.'; \ + 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.'; \ else \ ls /dev/tty* > /tmp/1; \ - echo "Detecting Pro Micro port, reset your Pro Micro now.\c"; \ + echo "Detecting USB port, reset your controller now.\c"; \ while [ -z $$USB ]; do \ sleep 1; \ echo ".\c"; \ @@ -157,7 +157,7 @@ avrdude: $(BUILD_DIR)/$(TARGET).hex USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \ done; \ echo ""; \ - echo "Detected Pro Micro port at $$USB"; \ + echo "Detected controller on USB port at $$USB"; \ sleep 1; \ avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex; \ fi