arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

Merge branch 'master' into esp8266

Browse Source 
* 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
This commit is contained in:
Ivan Grokhotkov 2015-05-18 14:54:06 +03:00
parent 6971cec922
commit 2510707911
14 changed files with 45 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitignore vendored
View File

@ -21,32 +21,36 @@ build/windows/libastylej*
build/windows/arduino-*.zip build/windows/arduino-*.zip
build/windows/dist/*.tar.gz build/windows/dist/*.tar.gz
build/windows/dist/*.tar.bz2 build/windows/dist/*.tar.bz2
build/windows/launch4j-* build/windows/launch4j-*.tgz
build/windows/launch4j-*.zip
build/windows/launcher/launch4j build/windows/launcher/launch4j
build/windows/WinAVR-*.zip build/windows/WinAVR-*.zip
build/macosx/arduino-*.zip build/macosx/arduino-*.zip
build/macosx/dist/*.tar.gz build/macosx/dist/*.tar.gz
build/macosx/dist/*.tar.bz2 build/macosx/dist/*.tar.bz2
build/macosx/*.tar.bz2
build/macosx/libastylej* build/macosx/libastylej*
build/macosx/appbundler*.jar build/macosx/appbundler*.jar
build/macosx/appbundler*.zip build/macosx/appbundler*.zip
build/macosx/appbundler build/macosx/appbundler
build/macosx/appbundler-1.0ea-arduino2 build/macosx/appbundler-1.0ea-arduino2
build/macosx/appbundler-1.0ea-upstream1
build/linux/work/ build/linux/work/
build/linux/dist/*.tar.gz build/linux/dist/*.tar.gz
build/linux/dist/*.tar.bz2 build/linux/dist/*.tar.bz2
build/linux/*.tgz build/linux/*.tgz
build/linux/*.tar.xz
build/linux/*.tar.bz2
build/linux/*.zip build/linux/*.zip
build/linux/libastylej* build/linux/libastylej*
build/shared/reference*.zip build/shared/reference*.zip
build/shared/Edison*.zip
build/shared/Galileo*.zip
test-bin test-bin
*.iml *.iml
.idea .idea
.DS_Store .DS_Store
.directory .directory
build/windows/launch4j-*
build/windows/launcher/launch4j
build/windows/WinAVR-*.zip
hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
avr-toolchain-*.zip avr-toolchain-*.zip
/hardware/tools/esp8266/utils/ /hardware/tools/esp8266/utils/
@ -57,6 +61,14 @@ avr-toolchain-*.zip
/hardware/tools/bossac.exe /hardware/tools/bossac.exe
/hardware/tools/listComPorts.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/esptool-*-osx.zip
build/macosx/dist/osx-xtensa-lx106-elf.tgz build/macosx/dist/osx-xtensa-lx106-elf.tgz

2
libraries/ESP8266WiFi/src/WiFiServer.h
View File

@ -1,6 +1,6 @@
/* /*
WiFiServer.h - Library for Arduino Wifi shield. 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 This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public

2
libraries/ESP8266WiFi/src/WiFiUdp.h
View File

@ -1,6 +1,6 @@
/* /*
WiFiUdp.h - Library for Arduino Wifi shield. 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 This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public

22
libraries/SD/README.adoc
View File

@ -7,18 +7,18 @@ http://arduino.cc/en/Reference/SD
== License == == 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 This program is free software: you can redistribute it and/or modify
modify it under the terms of the GNU Lesser General Public it under the terms of the GNU General Public License as published by
License as published by the Free Software Foundation; either the Free Software Foundation, either version 3 of the License, or
version 2.1 of the License, or (at your option) any later version. (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 but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Lesser General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU General Public License
License along with this library; if not, write to the Free Software along with this program. If not, see <http://www.gnu.org/licenses/>.
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

10
libraries/SD/examples/CardInfo/CardInfo.ino
View File

@ -44,19 +44,13 @@ void setup()
Serial.print("\nInitializing SD card..."); 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 // we'll use the initialization code from the utility libraries
// since we're just testing if the card is working! // since we're just testing if the card is working!
if (!card.init(SPI_HALF_SPEED, chipSelect)) { if (!card.init(SPI_HALF_SPEED, chipSelect)) {
Serial.println("initialization failed. Things to check:"); Serial.println("initialization failed. Things to check:");
Serial.println("* is a card is inserted?"); Serial.println("* is a card inserted?");
Serial.println("* Is your wiring correct?"); Serial.println("* is your wiring correct?");
Serial.println("* did you change the chipSelect pin to match your shield or module?"); Serial.println("* did you change the chipSelect pin to match your shield or module?");
return; return;
} else { } else {

7
libraries/SD/examples/Datalogger/Datalogger.ino
View File

@ -23,10 +23,6 @@
#include <SPI.h> #include <SPI.h>
#include <SD.h> #include <SD.h>
// 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; const int chipSelect = 4;
void setup() void setup()
@ -39,9 +35,6 @@ void setup()
Serial.print("Initializing SD card..."); 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: // see if the card is present and can be initialized:
if (!SD.begin(chipSelect)) { if (!SD.begin(chipSelect)) {

7
libraries/SD/examples/DumpFile/DumpFile.ino
View File

@ -23,10 +23,6 @@
#include <SPI.h> #include <SPI.h>
#include <SD.h> #include <SD.h>
// 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; const int chipSelect = 4;
void setup() void setup()
@ -39,9 +35,6 @@ void setup()
Serial.print("Initializing SD card..."); 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: // see if the card is present and can be initialized:
if (!SD.begin(chipSelect)) { if (!SD.begin(chipSelect)) {

5
libraries/SD/examples/Files/Files.ino
View File

@ -32,11 +32,6 @@ void setup()
Serial.print("Initializing SD card..."); 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)) { if (!SD.begin(4)) {
Serial.println("initialization failed!"); Serial.println("initialization failed!");

5
libraries/SD/examples/ReadWrite/ReadWrite.ino
View File

@ -33,11 +33,6 @@ void setup()
Serial.print("Initializing SD card..."); 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)) { if (!SD.begin(4)) {
Serial.println("initialization failed!"); Serial.println("initialization failed!");

5
libraries/SD/examples/listfiles/listfiles.ino
View File

@ -35,11 +35,6 @@ void setup()
} }
Serial.print("Initializing SD card..."); 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)) { if (!SD.begin(4)) {
Serial.println("initialization failed!"); Serial.println("initialization failed!");

4
libraries/SD/keywords.txt
View File

@ -6,8 +6,8 @@
# Datatypes (KEYWORD1) # Datatypes (KEYWORD1)
####################################### #######################################
SD KEYWORD1 SD KEYWORD1 SD
File KEYWORD1 File KEYWORD1 SD
####################################### #######################################
# Methods and Functions (KEYWORD2) # Methods and Functions (KEYWORD2)

2
libraries/SD/library.properties
View File

@ -1,5 +1,5 @@
name=SD name=SD
version=1.0 version=1.0.4
author=Arduino, SparkFun author=Arduino, SparkFun
maintainer=Arduino <info@arduino.cc> maintainer=Arduino <info@arduino.cc>
sentence=Enables reading and writing on SD cards. For all Arduino boards. sentence=Enables reading and writing on SD cards. For all Arduino boards.

2
libraries/SD/src/SD.cpp
View File

@ -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 // there is a special case for the Root directory since its a static dir
if (parentdir.isRoot()) { if (parentdir.isRoot()) {
if ( ! file.open(SD.root, filepath, mode)) { if ( ! file.open(root, filepath, mode)) {
// failed to open the file :( // failed to open the file :(
return File(); return File();
} }

4
libraries/SD/src/utility/Sd2Card.cpp
View File

@ -297,7 +297,7 @@ uint8_t Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
// command to go idle in SPI mode // command to go idle in SPI mode
while ((status_ = cardCommand(CMD0, 0)) != R1_IDLE_STATE) { 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); error(SD_CARD_ERROR_CMD0);
goto fail; goto fail;
} }
@ -319,7 +319,7 @@ uint8_t Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
while ((status_ = cardAcmd(ACMD41, arg)) != R1_READY_STATE) { while ((status_ = cardAcmd(ACMD41, arg)) != R1_READY_STATE) {
// check for timeout // check for timeout
if (((uint16_t)millis() - t0) > SD_INIT_TIMEOUT) { if (((uint16_t)(millis() - t0)) > SD_INIT_TIMEOUT) {
error(SD_CARD_ERROR_ACMD41); error(SD_CARD_ERROR_ACMD41);
goto fail; goto fail;
} }