dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed some mistakes :b

Browse source
This commit is contained in:
Masataro Asai 2013-05-29 01:30:07 +09:00
parent ebcb010684
commit 9ae7c63cca
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
arduino-mk/Arduino.mk
View file

@ -550,7 +550,7 @@ ifndef WAIT_CONNECTION_CMD
endif endif
ifeq ($(BOARD_TAG),leonardo) 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 else
ERROR_ON_LEONARDO = ERROR_ON_LEONARDO =
endif endif
@ -968,20 +968,23 @@ $(CORE_LIB): $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS)
$(DEP_FILE): $(OBJDIR) $(DEPS) $(DEP_FILE): $(OBJDIR) $(DEPS)
cat $(DEPS) > $(DEP_FILE) cat $(DEPS) > $(DEP_FILE)
upload: reset raw_upload error_on_leonardo:
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) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
$(AVRDUDE_UPLOAD_HEX) $(AVRDUDE_UPLOAD_HEX)
eeprom: reset raw_eeprom upload: reset %upload
raw_upload: error_on_leonardo %upload
raw_eeprom: $(TARGET_EEP) $(TARGET_HEX) %eeprom: $(TARGET_EEP) $(TARGET_HEX)
$(ERROR_ON_LEONARDO)
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \ $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
$(AVRDUDE_UPLOAD_EEP) $(AVRDUDE_UPLOAD_EEP)
eeprom: reset %eeprom
raw_eeprom: error_on_leonardo %eeprom
# the last part is for leonardo. # the last part is for leonardo.
# wait until leonardo reboots and establish a new connection. # wait until leonardo reboots and establish a new connection.
reset: reset: