g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sleep until USB port becomes writable before running avrdude (#5393) 

* sleep until usb port becomes writable before running avrdude

* only wait for a writable USB port when not on MSYS

using MINGW or MSYS: sleep for one second, as before.

otherwise: wait for the port to become writable.

* typo

* typo
daktil_manuform
Michael F. Lamb 2019-03-13 14:00:09 -07:00 committed by Drashna Jaelre
parent 5a12b054ae
commit f34244a871
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tmk_core/avr.mk
View File

@ -214,12 +214,15 @@ define EXEC_AVRDUDE
mv /tmp/2 /tmp/1; \ mv /tmp/2 /tmp/1; \
done; \ done; \
echo ""; \ echo ""; \
echo "Detected controller on USB port at $$USB"; \ echo "Device $$USB has appeared; assuming it is the controller."; \
if $(GREP) -q -s 'MINGW\|MSYS' /proc/version; then \ if $(GREP) -q -s 'MINGW\|MSYS' /proc/version; then \
USB=`echo "$$USB" | perl -pne 's/\/dev\/ttyS(\d+)/COM.($$1+1)/e'`; \ USB=`echo "$$USB" | perl -pne 's/\/dev\/ttyS(\d+)/COM.($$1+1)/e'`; \
echo "Remapped MSYS2 USB port to $$USB"; \ echo "Remapped MSYS2 USB port to $$USB"; \
fi; \
sleep 1; \ sleep 1; \
else \
printf "Waiting for $$USB to become writable."; \
while [ ! -w "$$USB" ]; do sleep 0.5; printf "."; done; echo ""; \
fi; \
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
endef endef