diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index de16a0e..58337fe 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -6,7 +6,7 @@ # Copyright (C) 2010,2011,2012 Martin Oldfield , based on # work that is copyright Nicholas Zambetti, David A. Mellis & Hernando # Barragan. -# +# # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as # published by the Free Software Foundation; either version 2.1 of the @@ -39,13 +39,13 @@ # # 0.6 22.vi.2011 M J Oldfield # - added ard-parse-boards supports -# - added -lc to linker opts, +# - added -lc to linker opts, # on Fabien Le Lez's advice # # 0.7 12.vii.2011 M J Oldfield # - moved -lm to the end of linker opts, # to solve Frank Knopf's problem; -# - added -F to stty opts: Craig Hollabaugh +# - added -F to stty opts: Craig Hollabaugh # reckons it's good for Ubuntu # # 0.8 12.ii.2012 M J Oldfield @@ -72,12 +72,12 @@ # defined (ex Peplin) # - Added a monitor target which talks to the # Arduino serial port (Peplin's suggestion) -# - Rejigged PATH calculations for general +# - Rejigged PATH calculations for general # tidiness (ex Peplin) # - Moved the reset target to Perl for # clarity and better error handling (ex # Daniele Vergini) -# +# ######################################################################## # # PATHS YOU NEED TO SET UP @@ -90,7 +90,7 @@ # 1. Things which are included in this distribution e.g. ard-parse-boards # => ARDMK_DIR # -# 2. Things which are always in the Arduino distribution e.g. +# 2. Things which are always in the Arduino distribution e.g. # boards.txt, libraries, &c. # => ARDUINO_DIR # @@ -114,13 +114,13 @@ # ARDMK_DIR = /usr/local # AVR_TOOLS_DIR = /usr # -# You can either set these up in the Makefile, or put them in your +# You can either set these up in the Makefile, or put them in your # environment e.g. in your .bashrc # # If you don't install the ard-... binaries to /usr/local/bin, but # instead copy them to e.g. /home/mjo/arduino.mk/bin then set # ARDML_DIR = /home/mjo/arduino.mk -# +# ######################################################################## # # DEPENDENCIES @@ -148,7 +148,7 @@ # # ARDUINO_LIBS - A list of any libraries used by the sketch (we # assume these are in -# $(ARDUINO_DIR)/hardware/libraries +# $(ARDUINO_DIR)/hardware/libraries # # ARDUINO_PORT - The port where the Arduino can be found (only needed # when uploading @@ -182,7 +182,7 @@ # SERIAL MONITOR # # The serial monitor just invokes the GNU screen program with suitable -# options. For more information see screen (1) and search for +# options. For more information see screen (1) and search for # 'character special device'. # # The really useful thing to know is that ^A-k gets you out! @@ -207,7 +207,7 @@ # 1. Things which are included in this distribution e.g. ard-parse-boards # => ARDMK_DIR # -# 2. Things which are always in the Arduino distribution e.g. +# 2. Things which are always in the Arduino distribution e.g. # boards.txt, libraries, &c. # => ARDUINO_DIR # @@ -232,7 +232,7 @@ # AVR_TOOLS_DIR = /usr # # -# +# # ######################################################################## # @@ -246,7 +246,7 @@ # # You might also need to set the fuse bits, but typically they'll be # read from boards.txt, based on the BOARD_TAG variable: -# +# # ISP_LOCK_FUSE_PRE = 0x3f # ISP_LOCK_FUSE_POST = 0xcf # ISP_HIGH_FUSE = 0xdf @@ -255,7 +255,7 @@ # # I think the fuses here are fine for uploading to the ATmega168 # without bootloader. -# +# # To actually do this upload use the ispload target: # # make ispload @@ -281,7 +281,7 @@ $(info Using autodetected ARDUINO_DIR '$(ARDUINO_DIR)') endif endif ######################################################################## -# +# # Default TARGET to cwd (ex Daniele Vergini) ifndef TARGET TARGET = $(notdir $(CURDIR)) @@ -701,19 +701,19 @@ raw_upload: $(TARGET_HEX) $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \ -U flash:w:$(TARGET_HEX):i -reset: +reset: $(RESET_CMD) $(ARD_PORT) # stty on MacOS likes -F, but on Debian it likes -f redirecting # stdin/out appears to work but generates a spurious error on MacOS at # least. Perhaps it would be better to just do it in perl ? -reset_stty: +reset_stty: for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \ do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \ done ;\ $$STTYF $(ARD_PORT) hupcl ;\ (sleep 0.1 || sleep 1) ;\ - $$STTYF $(ARD_PORT) -hupcl + $$STTYF $(ARD_PORT) -hupcl ispload: $(TARGET_HEX) $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e \ @@ -735,7 +735,7 @@ depends: $(DEPS) size: $(OBJDIR) $(TARGET_HEX) $(call avr_size,$(TARGET_ELF),$(TARGET_HEX)) -show_boards: +show_boards: $(PARSE_BOARD_CMD) --boards monitor: