Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix avrdude message to not mention any specific device model.

Browse source
This commit is contained in:
Phil Hagelberg 2017-10-16 09:01:43 -07:00 committed by Jack Humbert
parent ba4b3d9d72
commit 0f5928fdf4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tmk_core/avr.mk
View file

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