Merge branch 'master' into devel

This commit is contained in:
Andy CA6JAU 2017-10-22 23:13:05 -03:00
commit aa824aedf3
4 changed files with 13 additions and 9 deletions

View file

@ -377,6 +377,8 @@ ifneq ($(wildcard /usr/bin/stm32flash),)
/usr/bin/stm32flash -v -w bin/$(BINBIN_F1) -g 0x0 -R -i 20,-21,21:-20,21 /dev/ttyAMA0
endif
mmdvm_hs_hat: zumspot-pi
dfu:
ifdef devser
$(DFU_RST) $(devser) 750