diff options
| author | QMK Bot <hello@qmk.fm> | 2021-05-05 23:27:27 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-05-05 23:27:27 +0000 |
| commit | 45f710f3ffc747d50aad2f45f38917e674d81d3a (patch) | |
| tree | b1ca9c4440e7f717d4696c8c1917ad9e9e7a3aa8 /tmk_core | |
| parent | 15f4ab6a3fcc9f319b8192eb10c6d0d2d9222708 (diff) | |
| parent | 38b9f67c3b874ff33383ec2eb18aba58e4e9dfa1 (diff) | |
| download | qmk_firmware-45f710f3ffc747d50aad2f45f38917e674d81d3a.tar.gz qmk_firmware-45f710f3ffc747d50aad2f45f38917e674d81d3a.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index c1d3f6b39e..2bc7cc9553 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -160,6 +160,8 @@ define EXEC_AVRDUDE list_devices() { \ if $(GREP) -q -s icrosoft /proc/version; then \ wmic.exe path Win32_SerialPort get DeviceID 2>/dev/null | LANG=C perl -pne 's/COM(\d+)/COM.($$1-1)/e' | sed 's!COM!/dev/ttyS!' | xargs echo -n | sort; \ + elif [ "`uname`" = "FreeBSD" ]; then \ + ls /dev/tty* | grep -v '\.lock$$' | grep -v '\.init$$'; \ else \ ls /dev/tty*; \ fi; \ @@ -169,7 +171,7 @@ define EXEC_AVRDUDE TMP1=`mktemp`; \ TMP2=`mktemp`; \ list_devices > $$TMP1; \ - while [ -z $$USB ]; do \ + while [ -z "$$USB" ]; do \ sleep 0.5; \ printf "."; \ list_devices > $$TMP2; \ |