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

merged in the debian patches and removed trailing whitespace

Browse source 
most of the debian patches are just cosmetic (space/comments) so
easier to just merge upstream
This commit is contained in:
Simon John 2013-06-12 16:06:02 +02:00
parent e0c8d608de
commit 32eccc1a8a
2 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arduino-mk/Arduino.mk
View file

@ -53,7 +53,7 @@
# On Linux, you might prefer: # On Linux, you might prefer:
# #
# ARDUINO_DIR = /usr/share/arduino # ARDUINO_DIR = /usr/share/arduino
# ARDMK_DIR = /usr/local # ARDMK_DIR = /usr
# AVR_TOOLS_DIR = /usr # 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
@ -89,7 +89,7 @@
# BOARD_TAG = uno # BOARD_TAG = uno
# ARDUINO_PORT = /dev/cu.usb* # ARDUINO_PORT = /dev/cu.usb*
# #
# include /usr/local/share/Arduino.mk # include /usr/share/arduino/Arduino.mk
# #
# Hopefully these will be self-explanatory but in case they're not: # Hopefully these will be self-explanatory but in case they're not:
# #
@ -887,10 +887,10 @@ reset:
# least. Perhaps it would be better to just do it in perl ? # 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 <' ; \ for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \
do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \ do $$STTYF /dev/tty >/dev/null 2>&1 && break ; \
done ; \ done ; \
$$STTYF $(call get_arduino_port) hupcl ; \ $$STTYF $(call get_arduino_port) hupcl ; \
(sleep 0.1 || sleep 1) ;\ (sleep 0.1 2>/dev/null || sleep 1) ; \
$$STTYF $(call get_arduino_port) -hupcl $$STTYF $(call get_arduino_port) -hupcl
ispload: $(TARGET_EEP) $(TARGET_HEX) verify_size ispload: $(TARGET_EEP) $(TARGET_HEX) verify_size

2
bin/ard-parse-boards
View file

@ -12,7 +12,7 @@ use YAML;
# More discussion at https://github.com/sudar/Arduino-Makefile/issues/50 # More discussion at https://github.com/sudar/Arduino-Makefile/issues/50
my %Opt = my %Opt =
( (
boards_txt => '/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/boards.txt', boards_txt => '/usr/share/arduino/hardware/arduino/boards.txt',
); );
# if the ARDUINO_DIR is defined, then use it # if the ARDUINO_DIR is defined, then use it