dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
138 commits 3 branches 20 tags 2.4 MiB
Commit graph

96 commits

Author SHA1 Message Date
Matthijs Kooijman
5ea2437311 Fix raw_upload and reset for normal uploads 
In commit 90e3c9ad (Fix upload in case of parallelized make), some
dependencies were shuffled to (I assume) prevent the reset from
happening before or at the same time as the upload when running a
parallel make. However, this introduced two problems:
 - The upload and raw_upload became effectively the same, and both of
   them did a reset (even though raw_upload should do the upload without
   a reset).
 - The reset target does not depend on $(TARGET_HEX) or verify_size, so
   in a parallel make the reset is executed before / at the same time as
   the actual compilation (since the reset doesn't seem to be needed for
   at least the Arduino Uno, apparently avrdude handles this, this
   probably wasn't noticed by anyone).

Because we can't force a specific ordering of dependencies in parallel
make and because adding dependencies to the reset target doesn't seem
appropriate (you should be able to do a "make reset" without needing to
compile everything first), this commit changes the uploading to call
$(MAKE) again to do the actual upload.

The current approach ensures that:
 - raw_upload does a compile, size check and upload and upload does the
   same plus a reset.
 - A reset is not done if the compilation fails or the size check fails.
 - verify_size is called only once.
 2013-05-30 19:27:10 +02:00
Matthijs Kooijman
c64f38ae6d Check that there is exactly one .pde or .ino file 
When there are none (and no .cpp files either), the build would stall
trying to cat all the .d files together (which would result in cat
getting no arguments and thus waiting for input on stdin).

When there are multiple .ino and/or .pde files, the build could
technically work out, the Arduino IDE concatenates all .ino / .pde files
together and compiles them as a single compile unit, so unless we
implement that as well, it's better to just error out.
 2013-05-30 13:14:20 +02:00
Matthijs Kooijman
e1bed90404 Let MONITOR_BAUDRATE detection also look in .pde files 
Before, it would only look in .ino files. If you had no .ino file but
only a .pde file, this would cause the build to hang, since grep would
be waiting for input on its stdin.
 2013-05-30 13:09:15 +02:00
Matthijs Kooijman
05ce9fd14b When detecting MONITOR_BAUDRATE, use $(LOCAL_INO_SRCS) 
Now that this detection code is moved down a bit, it can use the same
.ino list as all the other code.
 2013-05-30 13:08:02 +02:00
Matthijs Kooijman
14fd6e7126 Move MONITOR_BAUDRATE detection further down 
No changes are made to the code, it is only moved. This allows it to use
LOCAL_INO_SRCS and LOCAL_INO_PDE_SRCS in the next commit.
 2013-05-30 12:55:10 +02:00
Sudar
e9f5897d19 Fixed the automatic baudrate detection script that was broken if the line already had the tab character 2013-01-03 22:31:24 +05:30
Sudar
0966e8e5f3 Auto detect sketchbook location even in MAC 2012-12-23 15:42:30 +05:30
gabriel
e3b86053eb merge changes from https://github.com/sudar 2012-12-16 17:06:23 +01:00
Sudar
4446705995 Merged changes from https://github.com/alohr 2012-12-15 19:54:02 +05:30
Sudar
addd140302 Enabled warnings 2012-12-15 19:35:58 +05:30
Adam Dunlap
9ebae306d0 Show original line number for error messages 2012-12-15 19:31:37 +05:30
Sudar
3afe25ba5a Added verify_size action 2012-12-15 18:57:08 +05:30
Sudar
2ffdb5b480 Merged all changes from rpavlik 2012-12-15 18:00:52 +05:30
Sudar
c039f5f39b Merged all commits from upstream 2012-12-15 17:29:59 +05:30
gabriel
86165af726 make build dir (OBJDIR) changeable 2012-12-14 23:10:03 +01:00
gabriel
168292425f add eeprom upload support 2012-11-17 22:18:56 +01:00
Fabio Pugliese Ornellas
bfd9dac216 Added dummy file to verify_size to avoid always being run. 2012-11-12 22:13:03 -02:00
Fabio Pugliese Ornellas
b5448a64dc Added sketch size verification. 2012-11-12 21:34:51 -02:00
gabriel
1e078625cb removing -w from CPPFLAGS (warnings can be usefull) 2012-11-06 14:33:10 +01:00
Jan Gosmann
90e3c9ad0b Fix upload in case of parallelized make. 2012-11-02 12:51:53 +01:00
Ryan Pavlik
edd514d65c Make the makefile error if the arduino port is not present. 2012-11-01 10:57:11 -05:00
Ryan Pavlik
ee98d0c89b Make everybody depend on the makefile, in case cflags are changed, etc. 2012-11-01 10:34:09 -05:00
Ryan Pavlik
a814a9c276 Be able to silence configuration output 2012-11-01 10:33:46 -05:00
Jan Gosmann
bc8caf8358 Fixing problem of hanging upload. 2012-11-01 12:03:32 +01:00
Andreas Lohr
adbd6532f9 set USB_VID and USB_PID only for leonardo boards 2012-10-07 10:28:10 +02:00
Ryan Pavlik
84648978fb Provide symbol_sizes and generated_assembly targets. 
Also update existing auxiliary targets with help, and
make the .PHONY list complete and in order.
 2012-09-20 11:30:46 -05:00
Ryan Pavlik
6041f6201d Change .sym output 2012-09-20 11:29:36 -05:00
Ryan Pavlik
05a31db481 Make disasm more helpful 2012-09-20 11:29:26 -05:00
Ryan Pavlik
24c2366f26 Use variables instead of hardcoded commands 2012-09-20 11:29:15 -05:00
Ryan Pavlik
87060fa5c2 Add knowledge of device-specific assembler 2012-09-20 11:28:42 -05: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
Ryan Pavlik
aaed1fc6fa Make listing files more useful 2012-08-23 12:39:42 -05:00
Ryan Pavlik
06bc8d6aa3 Allow passing extra flags 2012-08-23 12:39:31 -05: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