Skip to content

Commit 2510707

Browse files
igrrigrr
committed
Merge branch 'master' into esp8266
* master: (414 commits) Don't export sketch if the underlying core does not support it. Fixes #3171 RSyntaxTextArea: using a modified version, tracked at https://github.com/arduino/RSyntaxTextArea. Fixes #3099 Updated keywords.txt New editor on MacOSX: since CMD+J is known as "jump to selection" and the editor has no such feature, CMD+J is disabled on mac. See #3098 Old Preferences class remains for backwards compatibility as a delegate for PreferencesData New Preferences window: renders fine on every OS and it's easier to adapt using NetBeans as visual editor. Fixes #3140 Remove spawn from exec command Removed redundant call to File.deleteIfExists() Removed buggy redundant check in FileUtils.deleteIfExists() Restored current line/current selected lines display on lower left of the IDE. Fixes #3134 Updated cursor.ino New editor on MacOSX: restored CMD+E for finding selected text New editor on MacOSX: CMD+UP/DOWN moves cursor to start or end of sketch. See #3098 New editor on MacOSX: CMD+BACKSPACE deletes current line until cursor position, ALT+BACKSPACE deletes previous word. See #3098 ArduinoIDE is in the default package. Removed Fixes #2969: Fix Uncategorized warning message New editor: ALT+ BACKSPACE deletes next word (OSX only). See #3098 New editor: ALT+ UP/DOWN move current line only if "editor.advanced" (hidden pref) is true. Fixes #3101 New editor: mark occurrences enable when "editor.advanced" (hidden pref) is true. Fixes #3102 ... Conflicts: .gitignore build/build.xml hardware/esp8266com/esp8266/libraries/ESP8266WiFi/keywords.txt hardware/esp8266com/esp8266/libraries/ESP8266WiFi/library.properties hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h libraries/WiFi/README.adoc libraries/WiFi/src/WiFi.cpp libraries/WiFi/src/WiFiClient.cpp libraries/WiFi/src/WiFiClient.h libraries/WiFi/src/WiFiServer.cpp libraries/WiFi/src/WiFiUdp.cpp
1 parent 6971cec commit 2510707

File tree

14 files changed

+45
-68
lines changed

14 files changed

+45
-68
lines changed

‎.gitignore

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,36 @@ build/windows/libastylej*
2121
build/windows/arduino-*.zip
2222
build/windows/dist/*.tar.gz
2323
build/windows/dist/*.tar.bz2
24-
build/windows/launch4j-*
24+
build/windows/launch4j-*.tgz
25+
build/windows/launch4j-*.zip
2526
build/windows/launcher/launch4j
2627
build/windows/WinAVR-*.zip
2728
build/macosx/arduino-*.zip
2829
build/macosx/dist/*.tar.gz
2930
build/macosx/dist/*.tar.bz2
31+
build/macosx/*.tar.bz2
3032
build/macosx/libastylej*
3133
build/macosx/appbundler*.jar
3234
build/macosx/appbundler*.zip
3335
build/macosx/appbundler
3436
build/macosx/appbundler-1.0ea-arduino2
37+
build/macosx/appbundler-1.0ea-upstream1
3538
build/linux/work/
3639
build/linux/dist/*.tar.gz
3740
build/linux/dist/*.tar.bz2
3841
build/linux/*.tgz
42+
build/linux/*.tar.xz
43+
build/linux/*.tar.bz2
3944
build/linux/*.zip
4045
build/linux/libastylej*
4146
build/shared/reference*.zip
47+
build/shared/Edison*.zip
48+
build/shared/Galileo*.zip
4249
test-bin
4350
*.iml
4451
.idea
4552
.DS_Store
4653
.directory
47-
build/windows/launch4j-*
48-
build/windows/launcher/launch4j
49-
build/windows/WinAVR-*.zip
5054
hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
5155
avr-toolchain-*.zip
5256
/hardware/tools/esp8266/utils/
@@ -57,6 +61,14 @@ avr-toolchain-*.zip
5761
/hardware/tools/bossac.exe
5862
/hardware/tools/listComPorts.exe
5963

64+
/app/nbproject/private/
65+
/arduino-core/nbproject/private/
66+
/app/build/
67+
/arduino-core/build/
68+
69+
manifest.mf
70+
nbbuild.xml
71+
nbproject
6072
build/macosx/esptool-*-osx.zip
6173

6274
build/macosx/dist/osx-xtensa-lx106-elf.tgz

‎libraries/ESP8266WiFi/src/WiFiServer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
WiFiServer.h - Library for Arduino Wifi shield.
3-
Copyright (c) 2011-2014 Arduino. All right reserved.
3+
Copyright (c) 2011-2014 Arduino LLC. All right reserved.
44
55
This library is free software; you can redistribute it and/or
66
modify it under the terms of the GNU Lesser General Public

‎libraries/ESP8266WiFi/src/WiFiUdp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
WiFiUdp.h - Library for Arduino Wifi shield.
3-
Copyright (c) 2011-2014 Arduino. All right reserved.
3+
Copyright (c) 2011-2014 Arduino LLC. All right reserved.
44
55
This library is free software; you can redistribute it and/or
66
modify it under the terms of the GNU Lesser General Public

‎libraries/SD/README.adoc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ http://arduino.cc/en/Reference/SD
77

88
== License ==
99

10-
Copyright (c) Arduino LLC. All right reserved.
10+
Copyright (C) 2009 by William Greiman
11+
Copyright (c) 2010 SparkFun Electronics
1112

12-
This library is free software; you can redistribute it and/or
13-
modify it under the terms of the GNU Lesser General Public
14-
License as published by the Free Software Foundation; either
15-
version 2.1 of the License, or (at your option) any later version.
13+
This program is free software: you can redistribute it and/or modify
14+
it under the terms of the GNU General Public License as published by
15+
the Free Software Foundation, either version 3 of the License, or
16+
(at your option) any later version.
1617

17-
This library is distributed in the hope that it will be useful,
18+
This program is distributed in the hope that it will be useful,
1819
but WITHOUT ANY WARRANTY; without even the implied warranty of
19-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
20-
Lesser General Public License for more details.
20+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+
GNU General Public License for more details.
2122

22-
You should have received a copy of the GNU Lesser General Public
23-
License along with this library; if not, write to the Free Software
24-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
23+
You should have received a copy of the GNU General Public License
24+
along with this program. If not, see <http://www.gnu.org/licenses/>.

‎libraries/SD/examples/CardInfo/CardInfo.ino

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,13 @@ void setup()
4444

4545

4646
Serial.print("\nInitializing SD card...");
47-
// On the Ethernet Shield, CS is pin 4. It's set as an output by default.
48-
// Note that even if it's not used as the CS pin, the hardware SS pin
49-
// (10 on most Arduino boards, 53 on the Mega) must be left as an output
50-
// or the SD library functions will not work.
51-
pinMode(10, OUTPUT); // change this to 53 on a mega
52-
5347

5448
// we'll use the initialization code from the utility libraries
5549
// since we're just testing if the card is working!
5650
if (!card.init(SPI_HALF_SPEED, chipSelect)) {
5751
Serial.println("initialization failed. Things to check:");
58-
Serial.println("* is a card is inserted?");
59-
Serial.println("* Is your wiring correct?");
52+
Serial.println("* is a card inserted?");
53+
Serial.println("* is your wiring correct?");
6054
Serial.println("* did you change the chipSelect pin to match your shield or module?");
6155
return;
6256
} else {

‎libraries/SD/examples/Datalogger/Datalogger.ino

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
#include <SPI.h>
2424
#include <SD.h>
2525

26-
// On the Ethernet Shield, CS is pin 4. Note that even if it's not
27-
// used as the CS pin, the hardware CS pin (10 on most Arduino boards,
28-
// 53 on the Mega) must be left as an output or the SD library
29-
// functions will not work.
3026
const int chipSelect = 4;
3127

3228
void setup()
@@ -39,9 +35,6 @@ void setup()
3935

4036

4137
Serial.print("Initializing SD card...");
42-
// make sure that the default chip select pin is set to
43-
// output, even if you don't use it:
44-
pinMode(10, OUTPUT);
4538

4639
// see if the card is present and can be initialized:
4740
if (!SD.begin(chipSelect)) {

‎libraries/SD/examples/DumpFile/DumpFile.ino

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
#include <SPI.h>
2424
#include <SD.h>
2525

26-
// On the Ethernet Shield, CS is pin 4. Note that even if it's not
27-
// used as the CS pin, the hardware CS pin (10 on most Arduino boards,
28-
// 53 on the Mega) must be left as an output or the SD library
29-
// functions will not work.
3026
const int chipSelect = 4;
3127

3228
void setup()
@@ -39,9 +35,6 @@ void setup()
3935

4036

4137
Serial.print("Initializing SD card...");
42-
// make sure that the default chip select pin is set to
43-
// output, even if you don't use it:
44-
pinMode(10, OUTPUT);
4538

4639
// see if the card is present and can be initialized:
4740
if (!SD.begin(chipSelect)) {

‎libraries/SD/examples/Files/Files.ino

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ void setup()
3232

3333

3434
Serial.print("Initializing SD card...");
35-
// On the Ethernet Shield, CS is pin 4. It's set as an output by default.
36-
// Note that even if it's not used as the CS pin, the hardware SS pin
37-
// (10 on most Arduino boards, 53 on the Mega) must be left as an output
38-
// or the SD library functions will not work.
39-
pinMode(10, OUTPUT);
4035

4136
if (!SD.begin(4)) {
4237
Serial.println("initialization failed!");

‎libraries/SD/examples/ReadWrite/ReadWrite.ino

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ void setup()
3333

3434

3535
Serial.print("Initializing SD card...");
36-
// On the Ethernet Shield, CS is pin 4. It's set as an output by default.
37-
// Note that even if it's not used as the CS pin, the hardware SS pin
38-
// (10 on most Arduino boards, 53 on the Mega) must be left as an output
39-
// or the SD library functions will not work.
40-
pinMode(10, OUTPUT);
4136

4237
if (!SD.begin(4)) {
4338
Serial.println("initialization failed!");

‎libraries/SD/examples/listfiles/listfiles.ino

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ void setup()
3535
}
3636

3737
Serial.print("Initializing SD card...");
38-
// On the Ethernet Shield, CS is pin 4. It's set as an output by default.
39-
// Note that even if it's not used as the CS pin, the hardware SS pin
40-
// (10 on most Arduino boards, 53 on the Mega) must be left as an output
41-
// or the SD library functions will not work.
42-
pinMode(10, OUTPUT);
4338

4439
if (!SD.begin(4)) {
4540
Serial.println("initialization failed!");

‎libraries/SD/keywords.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
# Datatypes (KEYWORD1)
77
#######################################
88

9-
SD KEYWORD1
10-
File KEYWORD1
9+
SD KEYWORD1 SD
10+
File KEYWORD1 SD
1111

1212
#######################################
1313
# Methods and Functions (KEYWORD2)

‎libraries/SD/library.properties

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name=SD
2-
version=1.0
3-
author=Arduino, SparkFun
4-
maintainer=Arduino <[email protected]>
5-
sentence=Enables reading and writing on SD cards. For all Arduino boards.
6-
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.
7-
category=Data Storage
8-
url=http://arduino.cc/en/Reference/SD
9-
architectures=*
1+
name=SD
2+
version=1.0.4
3+
author=Arduino, SparkFun
4+
maintainer=Arduino <[email protected]>
5+
sentence=Enables reading and writing on SD cards. For all Arduino boards.
6+
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.
7+
category=Data Storage
8+
url=http://arduino.cc/en/Reference/SD
9+
architectures=*

‎libraries/SD/src/SD.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ File SDClass::open(const char *filepath, uint8_t mode) {
448448

449449
// there is a special case for the Root directory since its a static dir
450450
if (parentdir.isRoot()) {
451-
if ( ! file.open(SD.root, filepath, mode)) {
451+
if ( ! file.open(root, filepath, mode)) {
452452
// failed to open the file :(
453453
return File();
454454
}

‎libraries/SD/src/utility/Sd2Card.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ uint8_t Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
297297

298298
// command to go idle in SPI mode
299299
while ((status_ = cardCommand(CMD0, 0)) != R1_IDLE_STATE) {
300-
if (((uint16_t)millis() - t0) > SD_INIT_TIMEOUT) {
300+
if (((uint16_t)(millis() - t0)) > SD_INIT_TIMEOUT) {
301301
error(SD_CARD_ERROR_CMD0);
302302
goto fail;
303303
}
@@ -319,7 +319,7 @@ uint8_t Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
319319

320320
while ((status_ = cardAcmd(ACMD41, arg)) != R1_READY_STATE) {
321321
// check for timeout
322-
if (((uint16_t)millis() - t0) > SD_INIT_TIMEOUT) {
322+
if (((uint16_t)(millis() - t0)) > SD_INIT_TIMEOUT) {
323323
error(SD_CARD_ERROR_ACMD41);
324324
goto fail;
325325
}

0 commit comments

Comments
 (0)