Merge branch 'master' of https://github.com/espressif/arduino-esp32

docs/platformio.md

@@ -5,7 +5,7 @@ Installation instructions for using PlatformIO
 
 - [What is PlatformIO?](http://docs.platformio.org/page/what-is-platformio.html)
 - [PlatformIO IDE](http://platformio.org/platformio-ide)
-- Quick Start with [PlatformIO IDE](http://docs.platformio.org/page/ide/atom.html#quick-start) or [PlatformIO Core](http://docs.platformio.org/page/core.html)
+- [PlatformIO Core (CLI)](http://docs.platformio.org/page/core.html)
 - [Integration with Cloud and Standalone IDEs](http://docs.platformio.org/page/ide.html) -
   Cloud9, Codeanywehre, Eclipse Che (Codenvy), Atom, CLion, Eclipse, Emacs, NetBeans, Qt Creator, Sublime Text, VIM and Visual Studio
 - [Project Examples](https://github.com/platformio/platform-espressif32/tree/develop/examples)

libraries/SPI/src/SPI.cpp

@@ -49,10 +49,17 @@ void SPIClass::begin(int8_t sck, int8_t miso, int8_t mosi, int8_t ss)
         return;
     }
 
-    _sck = sck;
+    if(sck == -1 && miso == -1 && mosi == -1 && ss == -1) {
-    _miso = miso;
+        _sck = (_spi_num == VSPI) ? SCK : 14;
-    _mosi = mosi;
+        _miso = (_spi_num == VSPI) ? MISO : 12;
-    _ss = ss;
+        _mosi = (_spi_num == VSPI) ? MOSI : 13;
+        _ss = (_spi_num == VSPI) ? SS : 15;
+    } else {
+        _sck = sck;
+        _miso = miso;
+        _mosi = mosi;
+        _ss = ss;
+    }
 
     spiAttachSCK(_spi, _sck);
     spiAttachMISO(_spi, _miso);

libraries/SPI/src/SPI.h

@@ -52,7 +52,7 @@ private:
 
 public:
     SPIClass(uint8_t spi_bus=HSPI);
-    void begin(int8_t sck=SCK, int8_t miso=MISO, int8_t mosi=MOSI, int8_t ss=-1);
+    void begin(int8_t sck=-1, int8_t miso=-1, int8_t mosi=-1, int8_t ss=-1);
     void end();
 
     void setHwCs(bool use);