diff options
author | Nathan Sharfi <[email protected]> | 2016-05-31 15:22:45 -0700 |
---|---|---|
committer | Nathan Sharfi <[email protected]> | 2016-05-31 15:22:45 -0700 |
commit | a226255c0b34656b6bd1e3ff3d899929eb964a70 (patch) | |
tree | ef86445d195ccc2a2d135260006e1efe7f26e177 /tmk_core/rules.mk | |
parent | 222e8f031cef1d53c4d4ea33b3970193fcd070fa (diff) | |
parent | cea4b9a4bb4090b20612a43efa3378b95a6dcac0 (diff) | |
download | qmk_firmware-a226255c0b34656b6bd1e3ff3d899929eb964a70.tar.gz qmk_firmware-a226255c0b34656b6bd1e3ff3d899929eb964a70.zip |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/rules.mk')
-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 37be850f84..326d2a7872 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 |