diff options
| author | Simon John <git@the-jedi.co.uk> | 2013-07-03 09:29:34 +0200 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2013-07-03 09:29:34 +0200 |
| commit | 14d491c3bd06ff0bc50676db8dfd1893027f81fd (patch) | |
| tree | d6448bef265ac825af298c5c8f32d2e21a12afdb | |
| parent | ae3e5c78ac65b03d594746c08fb381d71e30fa11 (diff) | |
moved reset routines down past where we define CATERINA
my understanding of recursively expanded variables wasn't correct
| -rw-r--r-- | arduino-mk/Arduino.mk | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 1e80e79..25dfd66 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -447,25 +447,6 @@ else $(call show_config_variable,USER_LIB_PATH,[USER]) 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 @@ -563,6 +544,27 @@ else $(call show_config_variable,OBJDIR,[USER]) 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 # |