Merge remote-tracking branch 'origin/master' into develop

5 years ago · 1f8acb7619
parent 271c0cf136 070240f212
commit 1f8acb7619
1 changed files with 4 additions and 0 deletions
--- a/tmk_core/arm_atsam.mk
+++ b/tmk_core/arm_atsam.mk
@ -56,4 +56,8 @@ bin: $(BUILD_DIR)/$(TARGET).hex
 	$(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin;

 flash: bin
+ifneq ($(strip $(PROGRAM_CMD)),)
+	$(PROGRAM_CMD)
+else
 	$(PRINT_OK); $(SILENT) || printf "$(MSG_FLASH_ARCH)"
+endif