diff options
| author | Sudar <sudar@sudarmuthu.com> | 2013-06-13 02:19:36 -0700 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2013-06-13 02:19:36 -0700 |
| commit | 206b96c85c586a308401283954c2ed50174b77cd (patch) | |
| tree | 2dc5e41f3b5400919ab82c621592a0d58ae9c767 /arduino-mk/Arduino.mk | |
| parent | e0c8d608def493f842fc5e363f04457409bf9974 (diff) | |
| parent | d10066072f2df78432f0b577853d533215ca2773 (diff) | |
Merge pull request #66 from sej7278/d10066072f2df78432f0b577853d533215ca2773
Fix whitespace and add /dev/null redirection
Diffstat (limited to 'arduino-mk/Arduino.mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index fbd9a11..e737abf 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -395,14 +395,14 @@ ifndef WAIT_CONNECTION_CMD WAIT_CONNECTION_CMD = \ $(ARDMK_PATH)/wait-connection-leonardo $(call get_arduino_port) else - WAIT_CONNECTION_CMD = + WAIT_CONNECTION_CMD = endif endif ifeq ($(BOARD_TAG),leonardo) ERROR_ON_LEONARDO = $(error On leonardo, raw_xxx operation is not supported) else - ERROR_ON_LEONARDO = + ERROR_ON_LEONARDO = endif @@ -449,7 +449,7 @@ ifndef F_CPU F_CPU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.f_cpu) endif -ifeq ($(VARIANT),leonardo) +ifeq ($(VARIANT),leonardo) # USB IDs for the Leonardo ifndef USB_VID USB_VID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.vid 2>/dev/null) @@ -653,7 +653,7 @@ CPPFLAGS += -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) \ -ffunction-sections -fdata-sections # USB IDs for the Leonardo -ifeq ($(VARIANT),leonardo) +ifeq ($(VARIANT),leonardo) CPPFLAGS += -DUSB_VID=$(USB_VID) -DUSB_PID=$(USB_PID) endif @@ -887,10 +887,10 @@ reset: # least. Perhaps it would be better to just do it in perl ? reset_stty: for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \ - do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \ - done ;\ - $$STTYF $(call get_arduino_port) hupcl ;\ - (sleep 0.1 || sleep 1) ;\ + do $$STTYF /dev/tty >/dev/null 2>&1 && break ; \ + done ; \ + $$STTYF $(call get_arduino_port) hupcl ; \ + (sleep 0.1 2>/dev/null || sleep 1) ; \ $$STTYF $(call get_arduino_port) -hupcl ispload: $(TARGET_EEP) $(TARGET_HEX) verify_size |