summaryrefslogtreecommitdiff
path: root/tmk_core/rules.mk
diff options
context:
space:
mode:
Diffstat (limited to 'tmk_core/rules.mk')
-rw-r--r--tmk_core/rules.mk9
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