From 9ae7c63cca51ed6c3a18a272914e0c1ed88df26a Mon Sep 17 00:00:00 2001 From: Masataro Asai Date: Wed, 29 May 2013 01:30:07 +0900 Subject: [PATCH] fixed some mistakes :b --- arduino-mk/Arduino.mk | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index f24f8a4..cb9dede 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -550,7 +550,7 @@ ifndef WAIT_CONNECTION_CMD endif ifeq ($(BOARD_TAG),leonardo) - ERROR_ON_LEONARDO = $(error On leonardo, raw_*** operation is not supported) + ERROR_ON_LEONARDO = $(error On leonardo, raw_xxx operation is not supported) else ERROR_ON_LEONARDO = endif @@ -968,20 +968,23 @@ $(CORE_LIB): $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS) $(DEP_FILE): $(OBJDIR) $(DEPS) cat $(DEPS) > $(DEP_FILE) -upload: reset raw_upload - -raw_upload: $(TARGET_HEX) verify_size +error_on_leonardo: $(ERROR_ON_LEONARDO) + +%upload: $(TARGET_HEX) verify_size $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \ $(AVRDUDE_UPLOAD_HEX) -eeprom: reset raw_eeprom +upload: reset %upload +raw_upload: error_on_leonardo %upload -raw_eeprom: $(TARGET_EEP) $(TARGET_HEX) - $(ERROR_ON_LEONARDO) +%eeprom: $(TARGET_EEP) $(TARGET_HEX) $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \ $(AVRDUDE_UPLOAD_EEP) +eeprom: reset %eeprom +raw_eeprom: error_on_leonardo %eeprom + # the last part is for leonardo. # wait until leonardo reboots and establish a new connection. reset: