arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-19 09:42:11 +03:00
Code Activity

Merge arduino/master into esp8266

Browse Source 
* commit '71c39489180723b13cabe3c07e3994a239f8a03e':
  Updated translations
  Updated offline docs
  Corrected some email contacts.
  MacOS tests fix: new way of discovering work dir conflicts with tests execution. Fixed.
  Updated build_pull_request.bash
  Renamed mac build from "macosxnew" to "macosx-java-latest"
  Updated revision log. Version set to 1.6.0rc3
  build.xml and mac. Change in platform names: macosx now macosxnew, oldmacosx now macosx
  Fixed bug with paths with spaces
  build_pull_requests now builds oldmacosx as well
  Macosx: new appbundler, new macosx builds. Use platform=macosx and platform=oldmacosx
  build_pull_requests now moves the artifacts to the parent folder: this allows calling "clean" target before each build
  build.xml linux-clean target was not deleting old linux builds
  Fix typos in BlinkWithoutDelay.ino

Conflicts:
	build/build.xml
This commit is contained in:
Ivan Grokhotkov
2015-02-09 17:37:44 +03:00
parent edccc2c158 71c3948918
commit c7e363ca7b
34 changed files with 901 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/avr/libraries/SPI/SPI.cpp
View File

@ -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)

2
hardware/arduino/avr/libraries/SPI/SPI.h
View File

@ -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)

2
hardware/arduino/sam/cores/arduino/avr/dtostrf.c
View File

@ -1,7 +1,7 @@
/*
dtostrf - Emulation for dtostrf function from avr-libc
Copyright (c) 2013 Arduino. All rights reserved.
Written by Cristian Maglie <c.maglie@bug.st>
Written by Cristian Maglie <c.maglie@arduino.cc>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public

2
hardware/arduino/sam/cores/arduino/avr/dtostrf.h
View File

@ -1,7 +1,7 @@
/*
dtostrf - Emulation for dtostrf function from avr-libc
Copyright (c) 2013 Arduino. All rights reserved.
Written by Cristian Maglie <c.maglie@bug.st>
Written by Cristian Maglie <c.maglie@arduino.cc>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public

2
hardware/arduino/sam/libraries/SPI/SPI.cpp
View File

@ -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)
* SPI Master library for arduino.
*

2
hardware/arduino/sam/libraries/SPI/SPI.h
View File

@ -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)
* SPI Master library for arduino.
*

2
hardware/arduino/sam/libraries/Wire/Wire.cpp
View File

@ -1,6 +1,6 @@
/*
* TwoWire.h - TWI/I2C library for Arduino Due
* Copyright (c) 2011 Cristian Maglie <c.maglie@bug.st>.
* Copyright (c) 2011 Cristian Maglie <c.maglie@arduino.cc>
* All rights reserved.
*
* This library is free software; you can redistribute it and/or

2
hardware/arduino/sam/libraries/Wire/Wire.h
View File

@ -1,6 +1,6 @@
/*
* TwoWire.h - TWI/I2C library for Arduino Due
* Copyright (c) 2011 Cristian Maglie <c.maglie@bug.st>.
* Copyright (c) 2011 Cristian Maglie <c.maglie@arduino.cc>
* All rights reserved.
*
* This library is free software; you can redistribute it and/or