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

moved reset routines down past where we define CATERINA

Browse source 
my understanding of recursively expanded variables wasn't correct
This commit is contained in:
Simon John 2013-07-03 09:29:34 +02:00
parent ae3e5c78ac
commit 14d491c3bd
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
arduino-mk/Arduino.mk
View file

@ -447,25 +447,6 @@ else
$(call show_config_variable,USER_LIB_PATH,[USER]) $(call show_config_variable,USER_LIB_PATH,[USER])
endif endif
########################################################################
# Reset
#
ifndef RESET_CMD
ifneq ($(CATERINA),)
RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino --caterina \
$(ARD_RESET_OPTS) $(call get_arduino_port)
else
RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino \
$(ARD_RESET_OPTS) $(call get_arduino_port)
endif
endif
ifneq ($(CATERINA),)
ERROR_ON_LEONARDO = $(error On Leonardo, raw_xxx operation is not supported)
else
ERROR_ON_LEONARDO =
endif
######################################################################## ########################################################################
# boards.txt parsing # boards.txt parsing
@ -563,6 +544,27 @@ else
$(call show_config_variable,OBJDIR,[USER]) $(call show_config_variable,OBJDIR,[USER])
endif endif
########################################################################
# Reset
#
ifndef RESET_CMD
ifneq ($(CATERINA),)
RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino --caterina \
$(ARD_RESET_OPTS) $(call get_arduino_port)
else
RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino \
$(ARD_RESET_OPTS) $(call get_arduino_port)
endif
endif
ifneq ($(CATERINA),)
ERROR_ON_LEONARDO = $(error On Leonardo, raw_xxx operation is not supported)
else
ERROR_ON_LEONARDO =
endif
######################################################################## ########################################################################
# Local sources # Local sources
# #