1
0
Fork 0

Update to Makefile an ergodox readme (#365)

* Autodetect teensy-loader-cli over teensy_loader_cli.

Some distributions (e.g. Arch Linux, Guix) install teensy_loader_cli
as teensy-loader-cli. Use this one if it is installed.

* Update ergodox_ez/readme.md

- Mention Linux distris providing teensy-loader-cli
- Mention `make teensy ...`
This commit is contained in:
Hartmut Goebel 2016-05-31 16:03:04 +02:00 committed by Jack Humbert
parent 8ee9be11de
commit cea4b9a4bb
2 changed files with 9 additions and 4 deletions

View file

@ -317,7 +317,12 @@ REMOVE = rm -f
REMOVEDIR = rmdir
COPY = cp
WINSHELL = cmd
# Autodecct teensy loader
ifneq (, $(shell which teensy-loader-cli 2>/dev/null)))
TEENSY_LOADER_CLI = teensy-loader-cli
else
TEENSY_LOADER_CLI = teensy_loader_cli
endif
# Define Messages
# English
@ -425,7 +430,7 @@ program: $(TARGET).hex $(TARGET).eep
$(PROGRAM_CMD)
teensy: $(TARGET).hex
teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
$(TEENSY_LOADER_CLI) -mmcu=$(MCU) -w -v $(TARGET).hex
flip: $(TARGET).hex
batchisp -hardware usb -device $(MCU) -operation erase f