Commit graph

67 commits

Author SHA1 Message Date
Sudar
ac01a2609b Merged all commits from upstream 2012-12-15 17:07:00 +05:30
Jan Gosmann
90e3c9ad0b Fix upload in case of parallelized make. 2012-11-02 12:51:53 +01:00
Jan Gosmann
bc8caf8358 Fixing problem of hanging upload. 2012-11-01 12:03:32 +01:00
Martin Oldfield
184230fcf2 Added changelog 2012-09-17 18:08:22 +01:00
Martin Oldfield
869b5d8516 Added support for the USB PID/VID needed for the Leonardo, as per patches from Dan Villiom Podlaski Christiansen and Marc Plano-Lesay 2012-09-17 17:06:48 +01:00
Martin Oldfield
9395817c96 Only set AVRDUDE_CONF if it's not set, as per Tom Hall's patch 2012-09-17 16:38:46 +01:00
Martin Oldfield
03c80333a4 Only set OBJDIR if it is not already set; if we do set it make it $BOARD_TAG dependent. This follows comments from Matthias Urlichs and Scott Howard 2012-09-17 16:29:31 +01:00
Martin Oldfield
22b4a0834a Fixed ARDUNIO/ARDUINO typo in README.md as per Kalin Kozhuharov's comment 2012-09-17 16:25:21 +01:00
Martin Oldfield
b15aa4e88f Made the size target look at the ELF file, not the hex, as per Jared Szechy's patch. Craig Leres made a similar comment 2012-09-17 16:25:08 +01:00
Adam Dunlap
d8530a16e8 Making other *FLAGS += rather than = 2012-08-27 13:08:48 -07:00
jeffkowalski
ee0cb6e764 detabbed changelog, and appended my contributions 2012-08-18 23:36:40 -07:00
jeffkowalski
fc968b9191 Libraries may also contain subdirectory called "utility", containing
header files to be included and source files to be built.  Modified
SYS_LIBS and USER_LIBS to accomodate those directories if they exist.
2012-08-18 23:00:39 -07:00
jeffkowalski
486be238ba Added autodetection of ARDMK_DIR 2012-08-18 20:30:25 -07:00
jeffkowalski
d09a316d7a Added autodetection of ARDUINO_SKETCHBOOK, by looking to match IDE's
setting in $(HOME)/.arduino/preferences.txt before setting default of
$(HOME)/sketchbook.
2012-08-18 19:24:07 -07:00
jeffkowalski
eef73003c9 added auto-detection of ARDUINO_LIBS referenced in LOCAL_SRCS 2012-08-18 18:16:44 -07:00
Sudar
b74f2efbce Automatically read the BAUDRATE from sketch. Works only in linux for now 2012-07-15 13:56:13 +05:30
Sudar
eed8c52ffd Automatically read the BAUDRATE from sketch. Works only in linux for now 2012-07-15 13:25:45 +05:30
Sudar
4dc7457265 Don't include dependent makefile when doing make clean 2012-07-14 12:22:34 +05:30
Sudar
94fa378eaa Fixed line spacing and added doc block which got removed in the earlier commit 2012-07-14 12:21:54 +05:30
Sudar
ad005789a0 Changed bytes option for the head shell command, so that it works in Mac as well 2012-07-13 22:56:48 +05:30
Sudar
aabe3d2c58 Updated Readme 2012-07-13 22:52:27 +05:30
Sudar
75cdb933c3 Merged changes from https://github.com/rpavlik/Arduino-Makefile 2012-07-13 22:36:54 +05:30
Sudar
e470b070c3 Merged from https://github.com/gaftech/Arduino-Makefile/ 2012-07-13 21:52:59 +05:30
Gabriel
8d16c45b8d modified 'make size' behaviour 2012-07-06 15:52:42 +05:30
Gabriel
0068267fea allow user to choose source files 2012-07-06 15:02:43 +05:30
Sudar
fcdaa4b3bf Updated Readme and added the list of changes done in this fork 2012-07-06 12:12:43 +05:30
Ryan Pavlik
c93c8e16a5 Improved library finding logic.
Look first in the user dir. Any not found there are sought in the
system (Arduino) dir. If any are not found, error out right away
with a useful message. Show all libraries and where they were found
(user or system) in the config info.
2012-07-05 15:02:24 -05:00
Ryan Pavlik
6c7a8bad60 rename functions to allow nicer output.
This also lets us restore the non-overridable detection of avr-size type.
2012-07-05 15:01:11 -05:00
Ryan Pavlik
e6ac1cae3a Simplify user and system libraries 2012-07-05 14:39:50 -05:00
Ryan Pavlik
940a6b6ecc Simplify finding arduino dir 2012-07-05 14:39:32 -05:00
Ryan Pavlik
744cb5350d Clarify by adding (space-based) indentation.
Helps simplify understanding all the nested conditionals.
2012-07-05 14:04:35 -05:00
Ryan Pavlik
49cca1da11 Less shell-based implementation of dir_if_exists 2012-07-05 13:59:12 -05:00
Ryan Pavlik
1f1f438227 Clean up and improve displayed output. 2012-07-05 13:58:54 -05:00
Ryan Pavlik
13000c35ca Add info about setting USER_LIB_PATH and ARDMK_DIR relative to source. 2012-07-05 12:58:32 -05:00
Ryan Pavlik
6ab91c23be Clarify where we actually look for libs 2012-07-05 12:58:05 -05:00
Ryan Pavlik
229187d26c add the size and disasm targets to the docs 2012-07-05 12:57:45 -05:00
Ryan Pavlik
2a5e7fd242 Fix typo in docs 2012-07-05 12:57:32 -05:00
Ryan Pavlik
aaf74a971a Add autodetection caveat to docs 2012-07-05 12:57:24 -05:00
Ryan Pavlik
3bb4bde491 Remove duplicated section of documentation. 2012-07-05 12:57:02 -05:00
Ryan Pavlik
040f5c7388 Remove trailing spaces 2012-07-05 12:45:52 -05:00
Ryan Pavlik
8273ef1153 Dump size at the end of the build. 2012-07-05 12:45:19 -05:00
Ryan Pavlik
abad0738c0 Deduce whether we have an avr-patched version of size, and use it. 2012-07-05 12:45:05 -05:00
Ryan Pavlik
8896b8fcf6 Autodetect arduino version when possible 2012-07-05 12:29:33 -05:00
Ryan Pavlik
9027158e5f Add a disasm target to build the .lss file. 2012-07-03 12:36:00 -05:00
Sudar
8b99f165e7 Revert "Changed echo command to work on linux". Was having issues with Ubuntu and Mac
This reverts commit 1e5d7c1a33.
2012-07-02 13:47:28 +05:30
Gabriel
489dbb6fbb modified 'make size' behaviour 2012-07-01 13:04:39 +02:00
Gabriel
a128ce2020 allow user to choose source files 2012-07-01 12:52:36 +02:00
Ryan Pavlik
dfd32d2b2c Properly categorize libs into user and system automatically. 2012-06-28 18:32:41 -05:00
Ryan Pavlik
7f3fe66495 Only use Arduino's bundled AVR tools if they exist, otherwise try using "which" 2012-06-28 18:32:23 -05:00
Ryan Pavlik
854a7aa8c0 Be able to autodetect ARDUINO_DIR in some cases 2012-06-28 18:28:22 -05:00