Merge branch 'master' into idf-release/v3.3

Author: me-no-dev

README.md

@@ -36,12 +36,12 @@ You can use [EspExceptionDecoder](https://github.com/me-no-dev/EspExceptionDecod
 ### Issue/Bug report template
 Before reporting an issue, make sure you've searched for similar one that was already created. Also make sure to go through all the issues labelled as [for reference](https://github.com/espressif/arduino-esp32/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3A%22for%20reference%22%20).
 
-Finally, if you're sure no one else had the issue, follow the [ISSUE_TEMPLATE](docs/ISSUE_TEMPLATE.md) while reporting any issue.
+Finally, if you are sure no one else had the issue, follow the [ISSUE_TEMPLATE](docs/ISSUE_TEMPLATE.md) while reporting any issue.
 
 ### ESP32Dev Board PINMAP
 
 ![Pin Functions](docs/esp32_pinmap.png)
 
-### Hint
+### Tip
 
 Sometimes to program ESP32 via serial you must keep GPIO0 LOW during the programming process

boards.txt

@@ -334,6 +334,15 @@ tinypico.build.boot=dio
 tinypico.build.partitions=default
 tinypico.build.defines=
 
+tinypico.menu.PartitionScheme.default=Default
+tinypico.menu.PartitionScheme.default.build.partitions=default
+tinypico.menu.PartitionScheme.no_ota=No OTA (Large APP)
+tinypico.menu.PartitionScheme.no_ota.build.partitions=no_ota
+tinypico.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+tinypico.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+tinypico.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+tinypico.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
 tinypico.menu.UploadSpeed.921600=921600
 tinypico.menu.UploadSpeed.921600.upload.speed=921600
 tinypico.menu.UploadSpeed.115200=115200

cores/esp32/esp32-hal-spi.c

@@ -459,7 +459,7 @@ void spiWaitReady(spi_t * spi)
     while(spi->dev->cmd.usr);
 }
 
-void spiWrite(spi_t * spi, uint32_t *data, uint8_t len)
+void spiWrite(spi_t * spi, const uint32_t *data, uint8_t len)
 {
     if(!spi) {
         return;
@@ -671,7 +671,7 @@ void __spiTransferBytes(spi_t * spi, uint8_t * data, uint8_t * out, uint32_t byt
     }
 }
 
-void spiTransferBytes(spi_t * spi, uint8_t * data, uint8_t * out, uint32_t size)
+void spiTransferBytes(spi_t * spi, const uint8_t * data, uint8_t * out, uint32_t size)
 {
     if(!spi) {
         return;
@@ -861,7 +861,7 @@ uint32_t spiTransferLongNL(spi_t * spi, uint32_t data)
     return data;
 }
 
-void spiWriteNL(spi_t * spi, const void * data_in, size_t len){
+void spiWriteNL(spi_t * spi, const void * data_in, uint32_t len){
     size_t longs = len >> 2;
     if(len & 3){
         longs++;
@@ -887,7 +887,7 @@ void spiWriteNL(spi_t * spi, const void * data_in, size_t len){
     }
 }
 
-void spiTransferBytesNL(spi_t * spi, const void * data_in, uint8_t * data_out, size_t len){
+void spiTransferBytesNL(spi_t * spi, const void * data_in, uint8_t * data_out, uint32_t len){
     if(!spi) {
         return;
     }
@@ -974,7 +974,7 @@ void spiTransferBitsNL(spi_t * spi, uint32_t data, uint32_t * out, uint8_t bits)
     }
 }
 
-void IRAM_ATTR spiWritePixelsNL(spi_t * spi, const void * data_in, size_t len){
+void IRAM_ATTR spiWritePixelsNL(spi_t * spi, const void * data_in, uint32_t len){
     size_t longs = len >> 2;
     if(len & 3){
         longs++;

cores/esp32/esp32-hal-spi.h

@@ -96,7 +96,7 @@ void spiSetClockDiv(spi_t * spi, uint32_t clockDiv);
 void spiSetDataMode(spi_t * spi, uint8_t dataMode);
 void spiSetBitOrder(spi_t * spi, uint8_t bitOrder);
 
-void spiWrite(spi_t * spi, uint32_t *data, uint8_t len);
+void spiWrite(spi_t * spi, const uint32_t *data, uint8_t len);
 void spiWriteByte(spi_t * spi, uint8_t data);
 void spiWriteWord(spi_t * spi, uint16_t data);
 void spiWriteLong(spi_t * spi, uint32_t data);
@@ -105,7 +105,7 @@ void spiTransfer(spi_t * spi, uint32_t *out, uint8_t len);
 uint8_t spiTransferByte(spi_t * spi, uint8_t data);
 uint16_t spiTransferWord(spi_t * spi, uint16_t data);
 uint32_t spiTransferLong(spi_t * spi, uint32_t data);
-void spiTransferBytes(spi_t * spi, uint8_t * data, uint8_t * out, uint32_t size);
+void spiTransferBytes(spi_t * spi, const uint8_t * data, uint8_t * out, uint32_t size);
 void spiTransferBits(spi_t * spi, uint32_t data, uint32_t * out, uint8_t bits);
 
 /*
@@ -115,11 +115,11 @@ void spiTransaction(spi_t * spi, uint32_t clockDiv, uint8_t dataMode, uint8_t bi
 void spiSimpleTransaction(spi_t * spi);
 void spiEndTransaction(spi_t * spi);
 
-void spiWriteNL(spi_t * spi, const void * data, uint32_t len);
+void spiWriteNL(spi_t * spi, const void * data_in, uint32_t len);
 void spiWriteByteNL(spi_t * spi, uint8_t data);
 void spiWriteShortNL(spi_t * spi, uint16_t data);
 void spiWriteLongNL(spi_t * spi, uint32_t data);
-void spiWritePixelsNL(spi_t * spi, const void * data, uint32_t len);
+void spiWritePixelsNL(spi_t * spi, const void * data_in, uint32_t len);
 
 #define spiTransferNL(spi, data, len) spiTransferBytesNL(spi, data, data, len)
 uint8_t spiTransferByteNL(spi_t * spi, uint8_t data);

libraries/README.md

@@ -0,0 +1,95 @@
+# ESP32 Libraries
+
+arduino-esp32 includes libraries for Arduino compatibility along with some object wrappers around hardware specific devices.  Examples are included in the examples folder under each library folder.  The ESP32 includes additional examples which need no special drivers.
+
+### ArduinoOTA
+  Over The Air firmware update daemon.  Use espota.py to upload to the device.
+
+### AsyncUDP
+  Asynchronous task driven UDP datagram client/server
+
+### AzureIoT
+  Library to interact with Microsoft Azure IoT services
+
+### BLE
+  Bluetooth Low Energy v4.2 client/server framework
+
+### BluetoothSerial
+  Serial to Bluetooth redirection server
+
+### DNSServer
+  A basic UDP DNS daemon (includes captive portal demo)
+
+### EEPROM
+  Arduino compatibility for EEPROM (using flash)
+
+### ESP32
+  Additional examples
+  * AnalogOut
+  * Camera
+  * ChipID
+  * DeepSleep
+  * ESPNow
+  * FreeRTOS
+  * GPIO
+  * HallSensor
+  * I2S
+  * ResetReason
+  * RMT
+  * Time
+  * Timer
+  * Touch
+
+### ESPmDNS
+  mDNS service advertising
+
+### FFat
+  FAT indexed filesystem on SPI flash
+
+### FS
+  Filesystem virtualization framework
+
+### HTTPClient
+  A simple HTTP client, compatible with WiFiClientSecure
+
+### HTTPUpdate
+  Download a firmware update from HTTPd and apply it using Update
+
+### NetBIOS
+  NetBIOS name advertiser
+
+### Preferences
+  Flash keystore using ESP32 NVS
+
+### SD
+  Secure Digital card filesystem using SPI access
+
+### SD_MMC
+  Secure Digital card filesystem using 4-lane access
+
+### SimpleBLE
+  Minimal BLE advertiser
+
+### SPI
+  Arduino compatible Serial Peripheral Interface driver (master only)
+
+### SPIFFS
+  SPI Flash Filesystem (see [spiffs-plugin](https://github.com/me-no-dev/arduino-esp32fs-plugin) to upload to device)
+
+### Ticker
+  A timer to call functions on an interval
+
+### Update
+  Sketch Update using ESP32 OTA functionality
+
+### WebServer
+  A simple HTTP daemon
+
+### WiFi
+  Arduino compatible WiFi driver (includes Ethernet driver)
+
+### WiFiClientSecure
+  Arduino compatible WiFi client object using embedded encryption
+
+### Wire
+  Arduino compatible I2C driver (master only)

libraries/SPI/src/SPI.cpp

@@ -238,7 +238,7 @@ void SPIClass::writePixels(const void * data, uint32_t size)
  * @param out  uint8_t * output buffer. can be NULL for Write Only operation
  * @param size uint32_t
  */
-void SPIClass::transferBytes(uint8_t * data, uint8_t * out, uint32_t size)
+void SPIClass::transferBytes(const uint8_t * data, uint8_t * out, uint32_t size)
 {
     if(_inTransaction){
         return spiTransferBytesNL(_spi, data, out, size);
@@ -251,7 +251,7 @@ void SPIClass::transferBytes(uint8_t * data, uint8_t * out, uint32_t size)
  * @param size uint8_t  max for size is 64Byte
  * @param repeat uint32_t
  */
-void SPIClass::writePattern(uint8_t * data, uint8_t size, uint32_t repeat)
+void SPIClass::writePattern(const uint8_t * data, uint8_t size, uint32_t repeat)
 {
     if(size > 64) {
         return;    //max Hardware FIFO
@@ -272,12 +272,12 @@ void SPIClass::writePattern(uint8_t * data, uint8_t size, uint32_t repeat)
     }
 }
 
-void SPIClass::writePattern_(uint8_t * data, uint8_t size, uint8_t repeat)
+void SPIClass::writePattern_(const uint8_t * data, uint8_t size, uint8_t repeat)
 {
     uint8_t bytes = (size * repeat);
     uint8_t buffer[64];
     uint8_t * bufferPtr = &buffer[0];
-    uint8_t * dataPtr;
+    const uint8_t * dataPtr;
     uint8_t dataSize = bytes;
     for(uint8_t i = 0; i < repeat; i++) {
         dataSize = size;

libraries/SPI/src/SPI.h

@@ -48,7 +48,7 @@ class SPIClass
     uint32_t _div;
     uint32_t _freq;
     bool _inTransaction;
-    void writePattern_(uint8_t * data, uint8_t size, uint8_t repeat);
+    void writePattern_(const uint8_t * data, uint8_t size, uint8_t repeat);
 
 public:
     SPIClass(uint8_t spi_bus=HSPI);
@@ -70,15 +70,15 @@ class SPIClass
     uint16_t transfer16(uint16_t data);
     uint32_t transfer32(uint32_t data);
 
-    void transferBytes(uint8_t * data, uint8_t * out, uint32_t size);
+    void transferBytes(const uint8_t * data, uint8_t * out, uint32_t size);
     void transferBits(uint32_t data, uint32_t * out, uint8_t bits);
 
     void write(uint8_t data);
     void write16(uint16_t data);
     void write32(uint32_t data);
     void writeBytes(const uint8_t * data, uint32_t size);
     void writePixels(const void * data, uint32_t size);//ili9341 compatible
-    void writePattern(uint8_t * data, uint8_t size, uint32_t repeat);
+    void writePattern(const uint8_t * data, uint8_t size, uint32_t repeat);
 
     spi_t * bus(){ return _spi; }
 };

libraries/WiFiClientSecure/src/ssl_client.cpp

@@ -19,6 +19,9 @@
 #include "ssl_client.h"
 #include "WiFi.h"
 
+#ifndef MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED
+#  error "Please configure IDF framework to include mbedTLS -> Enable pre-shared-key ciphersuites and activate at least one cipher"
+#endif
 
 const char *pers = "esp32-tls";