From 383c19fd34eacf3f1c89a76e1e3b932f00f4141b Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 26 Jan 2015 02:35:02 +0300 Subject: [PATCH] Merge branch 'master' into esp8266 * master: (148 commits) Update revision log Cherry picked fix from 87865ac19df2f55e3d073cf5dc7ba08c0de4c584 Updated revision log Added dependencies for AStylej.dll Updated translations Update revision log Temporary fix for pulseIn() regression. Added README.adoc for the library manager project Fixed some libraries metadata. Temporary disabled DefaultTargetTest under certain conditions Updated translation from transifex Updated some translation strings Fixed test sam: Fixed initialization of UART/USART mode register update revision log Fixed NPE when import menu are empty Fixed NPE when currently selected platform is no more installed. Optimized FileUtils.recursiveDelete(File) function Fixed a bunch of simple warnings in java code Removed unused classes Commander.java and Webserver.java ... --- .gitignore | 14 +++++++++----- libraries/ESP8266WiFi/library.properties | 1 + libraries/SD/README.adoc | 24 ++++++++++++++++++++++++ libraries/SD/library.properties | 3 ++- libraries/SD/src/utility/Sd2Card.cpp | 12 ++++++++++-- 5 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 libraries/SD/README.adoc diff --git a/.gitignore b/.gitignore index 3df768b55..9a2f56075 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ app/bin/ app/pde.jar build/macosx/work/ -core/bin/ -core/core.jar +arduino-core/bin/ +arduino-core/arduino-core.jar hardware/arduino/bootloaders/caterina_LUFA/Descriptors.o hardware/arduino/bootloaders/caterina_LUFA/Descriptors.lst hardware/arduino/bootloaders/caterina_LUFA/Caterina.sym @@ -15,15 +15,18 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep hardware/arduino/bootloaders/caterina_LUFA/.dep/ build/libastylej-*.zip build/windows/work/ -build/windows/jre.zip +build/windows/*.zip +build/windows/*.tgz build/windows/libastylej* build/windows/arduino-*.zip -build/windows/dist/gcc-*.tar.gz +build/windows/dist/*.tar.gz +build/windows/dist/*.tar.bz2 build/windows/launch4j-* build/windows/launcher/launch4j build/windows/WinAVR-*.zip build/macosx/arduino-*.zip -build/macosx/dist/gcc-*.tar.gz +build/macosx/dist/*.tar.gz +build/macosx/dist/*.tar.bz2 build/macosx/libastylej* build/macosx/appbundler*.jar build/linux/work/ @@ -36,6 +39,7 @@ test-bin *.iml .idea .DS_Store +.directory build/windows/launch4j-* build/windows/launcher/launch4j build/windows/WinAVR-*.zip diff --git a/libraries/ESP8266WiFi/library.properties b/libraries/ESP8266WiFi/library.properties index 7e11beac0..0ac9b0f71 100644 --- a/libraries/ESP8266WiFi/library.properties +++ b/libraries/ESP8266WiFi/library.properties @@ -4,5 +4,6 @@ author=Arduino maintainer=Arduino sentence=Enables network connection (local and Internet) using the Arduino WiFi shield. For all Arduino boards. paragraph=With this library you can instantiate Servers, Clients and send/receive UDP packets through WiFi. The shield can connect either to open or encrypted networks (WEP, WPA). The IP address can be assigned statically or through a DHCP. The library can also manage DNS. +category=Communication url=http://arduino.cc/en/Reference/WiFi architectures=* diff --git a/libraries/SD/README.adoc b/libraries/SD/README.adoc new file mode 100644 index 000000000..ec57d15ce --- /dev/null +++ b/libraries/SD/README.adoc @@ -0,0 +1,24 @@ += SD Library for Arduino = + +The SD library allows for reading from and writing to SD cards. + +For more information about this library please visit us at +http://arduino.cc/en/Reference/SD + +== License == + +Copyright (c) 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 +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library 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. + +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 diff --git a/libraries/SD/library.properties b/libraries/SD/library.properties index 397a26aac..088d7c60f 100644 --- a/libraries/SD/library.properties +++ b/libraries/SD/library.properties @@ -1,8 +1,9 @@ name=SD version=1.0 author= -email= +maintainer= 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/utility/Sd2Card.cpp b/libraries/SD/src/utility/Sd2Card.cpp index 7e7cbf8ac..a72d3d271 100644 --- a/libraries/SD/src/utility/Sd2Card.cpp +++ b/libraries/SD/src/utility/Sd2Card.cpp @@ -157,16 +157,24 @@ uint32_t Sd2Card::cardSize(void) { } } //------------------------------------------------------------------------------ +static uint8_t chip_select_asserted = 0; + void Sd2Card::chipSelectHigh(void) { digitalWrite(chipSelectPin_, HIGH); #ifdef USE_SPI_LIB - SPI.endTransaction(); + if (chip_select_asserted) { + chip_select_asserted = 0; + SPI.endTransaction(); + } #endif } //------------------------------------------------------------------------------ void Sd2Card::chipSelectLow(void) { #ifdef USE_SPI_LIB - SPI.beginTransaction(settings); + if (!chip_select_asserted) { + chip_select_asserted = 1; + SPI.beginTransaction(settings); + } #endif digitalWrite(chipSelectPin_, LOW); }