diff options
| author | Martino Facchin <m.facchin@arduino.cc> | 2015-03-05 12:33:35 +0100 |
|---|---|---|
| committer | Martino Facchin <m.facchin@arduino.cc> | 2015-03-05 12:33:35 +0100 |
| commit | 6b396732ca2948ad2a00532f27b0134f5edb4b23 (patch) | |
| tree | 59ae7f5a9f9917514d1bd8dca0a7516ef99138dd | |
| parent | 97fb130175f777a0d3e051f2bdd74c5e0795e470 (diff) | |
| parent | 5cbfcfbf076e641483fa629eee4ebda9afacb68f (diff) | |
Merge branch 'ide-1.5.x' into SoftwareSerial
| -rw-r--r-- | libraries/SPI/SPI.cpp | 2 | ||||
| -rw-r--r-- | libraries/SPI/SPI.h | 2 | ||||
| -rw-r--r-- | platform.txt | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp index 077b6a3..9e7a116 100644 --- a/libraries/SPI/SPI.cpp +++ b/libraries/SPI/SPI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 by Cristian Maglie <c.maglie@bug.st> + * Copyright (c) 2010 by Cristian Maglie <c.maglie@arduino.cc> * Copyright (c) 2014 by Paul Stoffregen <paul@pjrc.com> (Transaction API) * Copyright (c) 2014 by Matthijs Kooijman <matthijs@stdin.nl> (SPISettings AVR) * Copyright (c) 2014 by Andrew J. Kroll <xxxajk@gmail.com> (atomicity fixes) diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h index cee618c..5206a09 100644 --- a/libraries/SPI/SPI.h +++ b/libraries/SPI/SPI.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 by Cristian Maglie <c.maglie@bug.st> + * Copyright (c) 2010 by Cristian Maglie <c.maglie@arduino.cc> * Copyright (c) 2014 by Paul Stoffregen <paul@pjrc.com> (Transaction API) * Copyright (c) 2014 by Matthijs Kooijman <matthijs@stdin.nl> (SPISettings AVR) * Copyright (c) 2014 by Andrew J. Kroll <xxxajk@gmail.com> (atomicity fixes) diff --git a/platform.txt b/platform.txt index 8347746..797e7e3 100644 --- a/platform.txt +++ b/platform.txt @@ -6,7 +6,7 @@ # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification name=Arduino AVR Boards -version=1.6.0 +version=1.6.1 # AVR compile variables # --------------------- @@ -61,10 +61,8 @@ recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compil ## Combine gc-sections, archives, and objects recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mmcu={build.mcu} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" {object_files} "{build.path}/{archive_file}" "-L{build.path}" -lm -## Create eeprom +## Create output files (.eep and .hex) recipe.objcopy.eep.pattern="{compiler.path}{compiler.objcopy.cmd}" {compiler.objcopy.eep.flags} {compiler.objcopy.eep.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.eep" - -## Create hex recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex" ## Compute size |