diff options
| author | Hartmut Goebel <htgoebel@users.noreply.github.com> | 2016-05-31 16:03:04 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-05-31 10:03:04 -0400 |
| commit | cea4b9a4bb4090b20612a43efa3378b95a6dcac0 (patch) | |
| tree | 3532b3cc60d50d203a1fc6c619593a72fd2c92ae /tmk_core | |
| parent | 8ee9be11dee3db265cd8a0cc22a8fe40f6067820 (diff) | |
| download | firmware-cea4b9a4bb4090b20612a43efa3378b95a6dcac0.tar.gz firmware-cea4b9a4bb4090b20612a43efa3378b95a6dcac0.tar.bz2 firmware-cea4b9a4bb4090b20612a43efa3378b95a6dcac0.zip | |
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 ...`
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/rules.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 37be850f8..326d2a787 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -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 |