From 27d450ded6a09ed91cb37bacb6fbb2aacaa40c2a Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 27 Mar 2015 11:17:58 +0300 Subject: [PATCH] Merge 1.6.1 into esp8266 * commit 'b8b2869753d488bfd203615637e1de3912589a92': (68 commits) Updated revisions.txt Fixed wrong path in successful message arduino-core: restored debug info in class files Fixed NPE in case of missing boardData Added missing translations Added windows drivers Added warning for uncertified boards Update revision.txt update revisions.txt SoftwareSerial: match bool API with HardwareSerial Fix to save as to parent folder is needed by all OSs, not just Mac Update revision.txt MacOSX: previous better IDE was missing some pieces. Added MacOSX: better IDE Updated revisions.txt NEW button now behaves as clicking File -> New menu entry. Fixes #2685 Windows: bundled JRE updated to 8u31 build.xml now uses unzip target Added .getParentFile() to saveas for mac. This prevents saving into the sketch itself Compound edits weren't part of the undo/redo dance An undoable action marks the sketh as modified ... --- .gitignore | 1 + README.md | 5 +++-- libraries/SD/library.properties | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 54d94ffce..f61a9a6d4 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ build/macosx/libastylej* build/macosx/appbundler*.jar build/macosx/appbundler*.zip build/macosx/appbundler +build/macosx/appbundler-1.0ea-arduino2 build/linux/work/ build/linux/dist/*.tar.gz build/linux/dist/*.tar.bz2 diff --git a/README.md b/README.md index 0c0e41751..be799fddc 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,11 @@ board and a development environment that implements the Processing/Wiring language. Arduino can be used to develop stand-alone interactive objects or can be connected to software on your computer (e.g. Flash, Processing, MaxMSP). The boards can be assembled by hand or purchased preassembled; the open-source -IDE can be downloaded for free. +IDE can be downloaded for free at http://arduino.cc/en/Main/Software * For more information, see the website at: http://www.arduino.cc/ -or the forums at: http://arduino.cc/forum/ +or the forums at: http://arduino.cc/forum/ +You can also follow Arduino on twitter at: https://twitter.com/arduino or like Arduino on Facebook at: https://www.facebook.com/official.arduino * To report a *bug* in the software or to request *a simple enhancement* go to: http://github.com/arduino/Arduino/issues diff --git a/libraries/SD/library.properties b/libraries/SD/library.properties index 088d7c60f..ad4a6d686 100644 --- a/libraries/SD/library.properties +++ b/libraries/SD/library.properties @@ -1,7 +1,7 @@ name=SD version=1.0 -author= -maintainer= +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