diff --git a/.gitignore b/.gitignore
index 44f4cda8b..3c8c0fe5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,32 +21,36 @@ build/windows/libastylej*
build/windows/arduino-*.zip
build/windows/dist/*.tar.gz
build/windows/dist/*.tar.bz2
-build/windows/launch4j-*
+build/windows/launch4j-*.tgz
+build/windows/launch4j-*.zip
build/windows/launcher/launch4j
build/windows/WinAVR-*.zip
build/macosx/arduino-*.zip
build/macosx/dist/*.tar.gz
build/macosx/dist/*.tar.bz2
+build/macosx/*.tar.bz2
build/macosx/libastylej*
build/macosx/appbundler*.jar
build/macosx/appbundler*.zip
build/macosx/appbundler
build/macosx/appbundler-1.0ea-arduino2
+build/macosx/appbundler-1.0ea-upstream1
build/linux/work/
build/linux/dist/*.tar.gz
build/linux/dist/*.tar.bz2
build/linux/*.tgz
+build/linux/*.tar.xz
+build/linux/*.tar.bz2
build/linux/*.zip
build/linux/libastylej*
build/shared/reference*.zip
+build/shared/Edison*.zip
+build/shared/Galileo*.zip
test-bin
*.iml
.idea
.DS_Store
.directory
-build/windows/launch4j-*
-build/windows/launcher/launch4j
-build/windows/WinAVR-*.zip
hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
avr-toolchain-*.zip
/hardware/tools/esp8266/utils/
@@ -57,6 +61,14 @@ avr-toolchain-*.zip
/hardware/tools/bossac.exe
/hardware/tools/listComPorts.exe
+/app/nbproject/private/
+/arduino-core/nbproject/private/
+/app/build/
+/arduino-core/build/
+
+manifest.mf
+nbbuild.xml
+nbproject
build/macosx/esptool-*-osx.zip
build/macosx/dist/osx-xtensa-lx106-elf.tgz
diff --git a/libraries/ESP8266WiFi/src/WiFiServer.h b/libraries/ESP8266WiFi/src/WiFiServer.h
index 3dd02da7d..ef642762d 100644
--- a/libraries/ESP8266WiFi/src/WiFiServer.h
+++ b/libraries/ESP8266WiFi/src/WiFiServer.h
@@ -1,6 +1,6 @@
/*
WiFiServer.h - Library for Arduino Wifi shield.
- Copyright (c) 2011-2014 Arduino. All right reserved.
+ Copyright (c) 2011-2014 Arduino LLC. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/libraries/ESP8266WiFi/src/WiFiUdp.h b/libraries/ESP8266WiFi/src/WiFiUdp.h
index a6bdc00da..f8d76cd05 100644
--- a/libraries/ESP8266WiFi/src/WiFiUdp.h
+++ b/libraries/ESP8266WiFi/src/WiFiUdp.h
@@ -1,6 +1,6 @@
/*
WiFiUdp.h - Library for Arduino Wifi shield.
- Copyright (c) 2011-2014 Arduino. All right reserved.
+ Copyright (c) 2011-2014 Arduino LLC. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/libraries/SD/README.adoc b/libraries/SD/README.adoc
index ec57d15ce..4c6521ed3 100644
--- a/libraries/SD/README.adoc
+++ b/libraries/SD/README.adoc
@@ -7,18 +7,18 @@ http://arduino.cc/en/Reference/SD
== License ==
-Copyright (c) Arduino LLC. All right reserved.
+ Copyright (C) 2009 by William Greiman
+Copyright (c) 2010 SparkFun Electronics
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
-This library is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
diff --git a/libraries/SD/examples/CardInfo/CardInfo.ino b/libraries/SD/examples/CardInfo/CardInfo.ino
index 03bab2fd6..8d8a51ec9 100644
--- a/libraries/SD/examples/CardInfo/CardInfo.ino
+++ b/libraries/SD/examples/CardInfo/CardInfo.ino
@@ -44,19 +44,13 @@ void setup()
Serial.print("\nInitializing SD card...");
- // On the Ethernet Shield, CS is pin 4. It's set as an output by default.
- // Note that even if it's not used as the CS pin, the hardware SS pin
- // (10 on most Arduino boards, 53 on the Mega) must be left as an output
- // or the SD library functions will not work.
- pinMode(10, OUTPUT); // change this to 53 on a mega
-
// we'll use the initialization code from the utility libraries
// since we're just testing if the card is working!
if (!card.init(SPI_HALF_SPEED, chipSelect)) {
Serial.println("initialization failed. Things to check:");
- Serial.println("* is a card is inserted?");
- Serial.println("* Is your wiring correct?");
+ Serial.println("* is a card inserted?");
+ Serial.println("* is your wiring correct?");
Serial.println("* did you change the chipSelect pin to match your shield or module?");
return;
} else {
diff --git a/libraries/SD/examples/Datalogger/Datalogger.ino b/libraries/SD/examples/Datalogger/Datalogger.ino
index 70e8f7051..e071b5282 100644
--- a/libraries/SD/examples/Datalogger/Datalogger.ino
+++ b/libraries/SD/examples/Datalogger/Datalogger.ino
@@ -23,10 +23,6 @@
#include
#include
-// On the Ethernet Shield, CS is pin 4. Note that even if it's not
-// used as the CS pin, the hardware CS pin (10 on most Arduino boards,
-// 53 on the Mega) must be left as an output or the SD library
-// functions will not work.
const int chipSelect = 4;
void setup()
@@ -39,9 +35,6 @@ void setup()
Serial.print("Initializing SD card...");
- // make sure that the default chip select pin is set to
- // output, even if you don't use it:
- pinMode(10, OUTPUT);
// see if the card is present and can be initialized:
if (!SD.begin(chipSelect)) {
diff --git a/libraries/SD/examples/DumpFile/DumpFile.ino b/libraries/SD/examples/DumpFile/DumpFile.ino
index b2f510f58..e2eaf1c59 100644
--- a/libraries/SD/examples/DumpFile/DumpFile.ino
+++ b/libraries/SD/examples/DumpFile/DumpFile.ino
@@ -23,10 +23,6 @@
#include
#include
-// On the Ethernet Shield, CS is pin 4. Note that even if it's not
-// used as the CS pin, the hardware CS pin (10 on most Arduino boards,
-// 53 on the Mega) must be left as an output or the SD library
-// functions will not work.
const int chipSelect = 4;
void setup()
@@ -39,9 +35,6 @@ void setup()
Serial.print("Initializing SD card...");
- // make sure that the default chip select pin is set to
- // output, even if you don't use it:
- pinMode(10, OUTPUT);
// see if the card is present and can be initialized:
if (!SD.begin(chipSelect)) {
diff --git a/libraries/SD/examples/Files/Files.ino b/libraries/SD/examples/Files/Files.ino
index d49539f38..f01db3828 100644
--- a/libraries/SD/examples/Files/Files.ino
+++ b/libraries/SD/examples/Files/Files.ino
@@ -32,11 +32,6 @@ void setup()
Serial.print("Initializing SD card...");
- // On the Ethernet Shield, CS is pin 4. It's set as an output by default.
- // Note that even if it's not used as the CS pin, the hardware SS pin
- // (10 on most Arduino boards, 53 on the Mega) must be left as an output
- // or the SD library functions will not work.
- pinMode(10, OUTPUT);
if (!SD.begin(4)) {
Serial.println("initialization failed!");
diff --git a/libraries/SD/examples/ReadWrite/ReadWrite.ino b/libraries/SD/examples/ReadWrite/ReadWrite.ino
index 42d1de388..055a0166b 100644
--- a/libraries/SD/examples/ReadWrite/ReadWrite.ino
+++ b/libraries/SD/examples/ReadWrite/ReadWrite.ino
@@ -33,11 +33,6 @@ void setup()
Serial.print("Initializing SD card...");
- // On the Ethernet Shield, CS is pin 4. It's set as an output by default.
- // Note that even if it's not used as the CS pin, the hardware SS pin
- // (10 on most Arduino boards, 53 on the Mega) must be left as an output
- // or the SD library functions will not work.
- pinMode(10, OUTPUT);
if (!SD.begin(4)) {
Serial.println("initialization failed!");
diff --git a/libraries/SD/examples/listfiles/listfiles.ino b/libraries/SD/examples/listfiles/listfiles.ino
index 22a79dd15..1500d74e0 100644
--- a/libraries/SD/examples/listfiles/listfiles.ino
+++ b/libraries/SD/examples/listfiles/listfiles.ino
@@ -35,11 +35,6 @@ void setup()
}
Serial.print("Initializing SD card...");
- // On the Ethernet Shield, CS is pin 4. It's set as an output by default.
- // Note that even if it's not used as the CS pin, the hardware SS pin
- // (10 on most Arduino boards, 53 on the Mega) must be left as an output
- // or the SD library functions will not work.
- pinMode(10, OUTPUT);
if (!SD.begin(4)) {
Serial.println("initialization failed!");
diff --git a/libraries/SD/keywords.txt b/libraries/SD/keywords.txt
index 419fe04d5..9893cc91d 100644
--- a/libraries/SD/keywords.txt
+++ b/libraries/SD/keywords.txt
@@ -6,8 +6,8 @@
# Datatypes (KEYWORD1)
#######################################
-SD KEYWORD1
-File KEYWORD1
+SD KEYWORD1 SD
+File KEYWORD1 SD
#######################################
# Methods and Functions (KEYWORD2)
diff --git a/libraries/SD/library.properties b/libraries/SD/library.properties
index ad4a6d686..4658054f8 100644
--- a/libraries/SD/library.properties
+++ b/libraries/SD/library.properties
@@ -1,9 +1,9 @@
-name=SD
-version=1.0
-author=Arduino, SparkFun
-maintainer=Arduino
-sentence=Enables reading and writing on SD cards. For all Arduino boards.
-paragraph=Once an SD memory card is connected to the SPI interfare of the Arduino board you are enabled to create files and read/write on them. You can also move through directories on the SD card.
-category=Data Storage
-url=http://arduino.cc/en/Reference/SD
-architectures=*
+name=SD
+version=1.0.4
+author=Arduino, SparkFun
+maintainer=Arduino
+sentence=Enables reading and writing on SD cards. For all Arduino boards.
+paragraph=Once an SD memory card is connected to the SPI interfare of the Arduino board you are enabled to create files and read/write on them. You can also move through directories on the SD card.
+category=Data Storage
+url=http://arduino.cc/en/Reference/SD
+architectures=*
diff --git a/libraries/SD/src/SD.cpp b/libraries/SD/src/SD.cpp
index 6862daed8..28df356c8 100644
--- a/libraries/SD/src/SD.cpp
+++ b/libraries/SD/src/SD.cpp
@@ -448,7 +448,7 @@ File SDClass::open(const char *filepath, uint8_t mode) {
// there is a special case for the Root directory since its a static dir
if (parentdir.isRoot()) {
- if ( ! file.open(SD.root, filepath, mode)) {
+ if ( ! file.open(root, filepath, mode)) {
// failed to open the file :(
return File();
}
diff --git a/libraries/SD/src/utility/Sd2Card.cpp b/libraries/SD/src/utility/Sd2Card.cpp
index 2d7618d65..98b6e4e84 100644
--- a/libraries/SD/src/utility/Sd2Card.cpp
+++ b/libraries/SD/src/utility/Sd2Card.cpp
@@ -297,7 +297,7 @@ uint8_t Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
// command to go idle in SPI mode
while ((status_ = cardCommand(CMD0, 0)) != R1_IDLE_STATE) {
- if (((uint16_t)millis() - t0) > SD_INIT_TIMEOUT) {
+ if (((uint16_t)(millis() - t0)) > SD_INIT_TIMEOUT) {
error(SD_CARD_ERROR_CMD0);
goto fail;
}
@@ -319,7 +319,7 @@ uint8_t Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
while ((status_ = cardAcmd(ACMD41, arg)) != R1_READY_STATE) {
// check for timeout
- if (((uint16_t)millis() - t0) > SD_INIT_TIMEOUT) {
+ if (((uint16_t)(millis() - t0)) > SD_INIT_TIMEOUT) {
error(SD_CARD_ERROR_ACMD41);
goto fail;
}