Merge branch 'master' into erase_flash

Author: P-R-O-C-H-Y

boards.txt

@@ -38,7 +38,7 @@ class WiFiAPClass
 public:
 
     bool softAP(const char* ssid, const char* passphrase = NULL, int channel = 1, int ssid_hidden = 0, int max_connection = 4, bool ftm_responder = false);
-    bool softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dhcp_lease_start = INADDR_NONE);
+    bool softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dhcp_lease_start = (uint32_t) 0);
     bool softAPdisconnect(bool wifioff = false);
 
     uint8_t softAPgetStationNum();

libraries/WiFi/src/WiFiAP.h

@@ -668,7 +668,7 @@ bool wifiLowLevelInit(bool persistent){
 	    cfg.static_tx_buf_num = 0;
             cfg.dynamic_tx_buf_num = 32;
 	    cfg.tx_buf_type = 1;
-            cfg.cache_tx_buf_num = 1;  // can't be zero!
+            cfg.cache_tx_buf_num = 4;  // can't be zero!
 	    cfg.static_rx_buf_num = 4;
             cfg.dynamic_rx_buf_num = 32;
         }

libraries/WiFi/src/WiFiGeneric.cpp

@@ -21,7 +21,7 @@
 #include "WiFi.h"
 
 #if !defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED) && !defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
-#  warning "Please configure IDF framework to include mbedTLS -> Enable pre-shared-key ciphersuites and activate at least one cipher"
+#  warning "Please configure IDF framework to include mbedTLS -> Enable PSK based ciphersuite modes (MBEDTLS_KEY_EXCHANGE_PSK) and activate at least one cipher"
 #else
 
 const char *pers = "esp32-tls";

libraries/WiFiClientSecure/src/ssl_client.cpp

@@ -38,8 +38,11 @@ TwoWire::TwoWire(uint8_t bus_num)
     :num(bus_num & 1)
     ,sda(-1)
     ,scl(-1)
+    ,bufferSize(I2C_BUFFER_LENGTH) // default Wire Buffer Size
+    ,rxBuffer(NULL)
     ,rxIndex(0)
     ,rxLength(0)
+    ,txBuffer(NULL)
     ,txLength(0)
     ,txAddress(0)
     ,_timeOutMillis(50)
@@ -74,8 +77,12 @@ bool TwoWire::initPins(int sdaPin, int sclPin)
             }
         } else {
             if(sda==-1) {
+#ifdef WIRE1_PIN_DEFINED
+                sdaPin = SDA1;
+#else
                 log_e("no Default SDA Pin for Second Peripheral");
                 return false; //no Default pin for Second Peripheral
+#endif
             } else {
                 sdaPin = sda;    // reuse prior pin
             }
@@ -91,8 +98,12 @@ bool TwoWire::initPins(int sdaPin, int sclPin)
             }
         } else {
             if(scl == -1) {
+#ifdef WIRE1_PIN_DEFINED
+                sclPin = SCL1;
+#else
                 log_e("no Default SCL Pin for Second Peripheral");
                 return false; //no Default pin for Second Peripheral
+#endif
             } else {
                 sclPin = scl;    // reuse prior pin
             }
@@ -132,6 +143,87 @@ bool TwoWire::setPins(int sdaPin, int sclPin)
     return !i2cIsInit(num);
 }
 
+bool TwoWire::allocateWireBuffer(void)
+{
+    // or both buffer can be allocated or none will be
+    if (rxBuffer == NULL) {
+            rxBuffer = (uint8_t *)malloc(bufferSize);
+            if (rxBuffer == NULL) {
+                log_e("Can't allocate memory for I2C_%d rxBuffer", num);
+                return false;
+            }
+    }
+    if (txBuffer == NULL) {
+            txBuffer = (uint8_t *)malloc(bufferSize);
+            if (txBuffer == NULL) {
+                log_e("Can't allocate memory for I2C_%d txBuffer", num);
+                freeWireBuffer();  // free rxBuffer for safety!
+                return false;
+            }
+    }
+    // in case both were allocated before, they must have the same size. All good.
+    return true;
+}
+
+void TwoWire::freeWireBuffer(void)
+{
+    if (rxBuffer != NULL) {
+        free(rxBuffer);
+        rxBuffer = NULL;
+    }
+    if (txBuffer != NULL) {
+        free(txBuffer);
+        txBuffer = NULL;
+    }
+}
+
+size_t TwoWire::setBufferSize(size_t bSize)
+{
+    // Maximum size .... HEAP limited ;-)
+    if (bSize < 32) {    // 32 bytes is the I2C FIFO Len for ESP32/S2/S3/C3
+        log_e("Minimum Wire Buffer size is 32 bytes");
+        return 0;
+    }
+
+#if !CONFIG_DISABLE_HAL_LOCKS
+    if(lock == NULL){
+        lock = xSemaphoreCreateMutex();
+        if(lock == NULL){
+            log_e("xSemaphoreCreateMutex failed");
+            return 0;
+        }
+    }
+    //acquire lock
+    if(xSemaphoreTake(lock, portMAX_DELAY) != pdTRUE){
+        log_e("could not acquire lock");
+        return 0;
+    }
+#endif
+    // allocateWireBuffer allocates memory for both pointers or just free them
+    if (rxBuffer != NULL || txBuffer != NULL) {
+        // if begin() has been already executed, memory size changes... data may be lost. We don't care! :^)
+        if (bSize != bufferSize) {
+            // we want a new buffer size ... just reset buffer pointers and allocate new ones
+            freeWireBuffer();
+            bufferSize = bSize;
+            if (!allocateWireBuffer()) {
+                // failed! Error message already issued
+                bSize = 0; // returns error
+                log_e("Buffer allocation failed");
+            }
+        } // else nothing changes, all set!
+    } else {
+        // no memory allocated yet, just change the size value - allocation in begin()
+        bufferSize = bSize;
+    }
+#if !CONFIG_DISABLE_HAL_LOCKS
+    //release lock
+    xSemaphoreGive(lock);
+    
+#endif
+    return bSize;
+}
+
 // Slave Begin
 bool TwoWire::begin(uint8_t addr, int sdaPin, int sclPin, uint32_t frequency)
 {
@@ -159,17 +251,22 @@ bool TwoWire::begin(uint8_t addr, int sdaPin, int sclPin, uint32_t frequency)
         log_e("Bus already started in Master Mode.");
         goto end;
     }
+    if (!allocateWireBuffer()) {
+        // failed! Error Message already issued
+        goto end;
+    }
     if(!initPins(sdaPin, sclPin)){
         goto end;
     }
     i2cSlaveAttachCallbacks(num, onRequestService, onReceiveService, this);
-    if(i2cSlaveInit(num, sda, scl, addr, frequency, I2C_BUFFER_LENGTH, I2C_BUFFER_LENGTH) != ESP_OK){
+    if(i2cSlaveInit(num, sda, scl, addr, frequency, bufferSize, bufferSize) != ESP_OK){
         log_e("Slave Init ERROR");
         goto end;
     }
     is_slave = true;
     started = true;
 end:
+    if (!started) freeWireBuffer();
 #if !CONFIG_DISABLE_HAL_LOCKS
     //release lock
     xSemaphoreGive(lock);
@@ -205,13 +302,18 @@ bool TwoWire::begin(int sdaPin, int sclPin, uint32_t frequency)
         started = true;
         goto end;
     }
+    if (!allocateWireBuffer()) {
+        // failed! Error Message already issued
+        goto end;
+    }
     if(!initPins(sdaPin, sclPin)){
         goto end;
     }
     err = i2cInit(num, sda, scl, frequency);
     started = (err == ESP_OK);
 
 end:
+    if (!started) freeWireBuffer();
 #if !CONFIG_DISABLE_HAL_LOCKS
     //release lock
     xSemaphoreGive(lock);
@@ -239,6 +341,7 @@ bool TwoWire::end()
         } else if(i2cIsInit(num)){
             err = i2cDeinit(num);
         }
+        freeWireBuffer();
 #if !CONFIG_DISABLE_HAL_LOCKS
         //release lock
         xSemaphoreGive(lock);
@@ -325,12 +428,26 @@ void TwoWire::beginTransmission(uint16_t address)
     txLength = 0;
 }
 
+/*
+https://www.arduino.cc/reference/en/language/functions/communication/wire/endtransmission/
+endTransmission() returns:
+0: success.
+1: data too long to fit in transmit buffer.
+2: received NACK on transmit of address.
+3: received NACK on transmit of data.
+4: other error.
+5: timeout
+*/
 uint8_t TwoWire::endTransmission(bool sendStop)
 {
     if(is_slave){
         log_e("Bus is in Slave Mode");
         return 4;
     }
+    if (txBuffer == NULL){
+        log_e("NULL TX buffer pointer");
+        return 4;
+    }
     esp_err_t err = ESP_OK;
     if(sendStop){
         err = i2cWrite(num, txAddress, txBuffer, txLength, _timeOutMillis);
@@ -360,6 +477,10 @@ size_t TwoWire::requestFrom(uint16_t address, size_t size, bool sendStop)
         log_e("Bus is in Slave Mode");
         return 0;
     }
+    if (rxBuffer == NULL || txBuffer == NULL){
+        log_e("NULL buffer pointer");
+        return 0;
+    }
     esp_err_t err = ESP_OK;
     if(nonStop
 #if !CONFIG_DISABLE_HAL_LOCKS
@@ -401,7 +522,11 @@ size_t TwoWire::requestFrom(uint16_t address, size_t size, bool sendStop)
 
 size_t TwoWire::write(uint8_t data)
 {
-    if(txLength >= I2C_BUFFER_LENGTH) {
+    if (txBuffer == NULL){
+        log_e("NULL TX buffer pointer");
+        return 0;
+    }
+    if(txLength >= bufferSize) {
         return 0;
     }
     txBuffer[txLength++] = data;
@@ -428,6 +553,10 @@ int TwoWire::available(void)
 int TwoWire::read(void)
 {
     int value = -1;
+    if (rxBuffer == NULL){
+        log_e("NULL RX buffer pointer");
+        return value;
+    }
     if(rxIndex < rxLength) {
         value = rxBuffer[rxIndex++];
     }
@@ -437,6 +566,10 @@ int TwoWire::read(void)
 int TwoWire::peek(void)
 {
     int value = -1;
+    if (rxBuffer == NULL){
+        log_e("NULL RX buffer pointer");
+        return value;
+    }
     if(rxIndex < rxLength) {
         value = rxBuffer[rxIndex];
     }
@@ -520,6 +653,10 @@ void TwoWire::onReceiveService(uint8_t num, uint8_t* inBytes, size_t numBytes, b
     if(!wire->user_onReceive){
         return;
     }
+    if (wire->rxBuffer == NULL){
+        log_e("NULL RX buffer pointer");
+        return;
+    }
     for(uint8_t i = 0; i < numBytes; ++i){
         wire->rxBuffer[i] = inBytes[i];    
     }
@@ -534,6 +671,10 @@ void TwoWire::onRequestService(uint8_t num, void * arg)
     if(!wire->user_onRequest){
         return;
     }
+    if (wire->txBuffer == NULL){
+        log_e("NULL TX buffer pointer");
+        return;
+    }
     wire->txLength = 0;
     wire->user_onRequest();
     if(wire->txLength){

libraries/Wire/src/Wire.cpp

@@ -34,8 +34,13 @@
 #endif
 #include "Stream.h"
 
+// WIRE_HAS_BUFFER_SIZE means Wire has setBufferSize()
+#define WIRE_HAS_BUFFER_SIZE    1
+// WIRE_HAS_END means Wire has end() 
+#define WIRE_HAS_END 1
+
 #ifndef I2C_BUFFER_LENGTH
-    #define I2C_BUFFER_LENGTH 128
+    #define I2C_BUFFER_LENGTH 128  // Default size, if none is set using Wire::setBuffersize(size_t)
 #endif
 typedef void(*user_onRequest)(void);
 typedef void(*user_onReceive)(uint8_t*, int);
@@ -47,11 +52,12 @@ class TwoWire: public Stream
     int8_t sda;
     int8_t scl;
 
-    uint8_t rxBuffer[I2C_BUFFER_LENGTH];
+    size_t bufferSize;
+    uint8_t *rxBuffer;
     size_t rxIndex;
     size_t rxLength;
 
-    uint8_t txBuffer[I2C_BUFFER_LENGTH];
+    uint8_t *txBuffer;
     size_t txLength;
     uint16_t txAddress;
 
@@ -68,6 +74,8 @@ class TwoWire: public Stream
     static void onRequestService(uint8_t, void *);
     static void onReceiveService(uint8_t, uint8_t*, size_t, bool, void *);
     bool initPins(int sdaPin, int sclPin);
+    bool allocateWireBuffer(void);
+    void freeWireBuffer(void);
 
 public:
     TwoWire(uint8_t bus_num);
@@ -93,6 +101,8 @@ class TwoWire: public Stream
     }
     bool end();
 
+    size_t setBufferSize(size_t bSize);
+
     void setTimeOut(uint16_t timeOutMillis); // default timeout of i2c transactions is 50ms
     uint16_t getTimeOut();
 

libraries/Wire/src/Wire.h

@@ -26,6 +26,7 @@ static const uint8_t RX = 3;
 static const uint8_t SDA = 22;//23;
 static const uint8_t SCL = 21;//19;
 
+#define WIRE1_PIN_DEFINED 1             // See Wire.cpp at bool TwoWire::initPins(int sdaPin, int sclPin)
 static const uint8_t SDA1 = 12;
 static const uint8_t SCL1 = 13;
 

variants/Microduino-esp32/pins_arduino.h

@@ -0,0 +1,11 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,          0x8000, 4K
+
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  1408K,
+ota_1,    0,    ota_1,  0x170000,  1408K,
+uf2,      app,  factory,0x2d0000,  256K,
+ffat,     data, fat,    0x310000,  960K,

variants/adafruit_feather_esp32s2/bootloader-tinyuf2.bin

@@ -0,0 +1,11 @@
+# ESP-IDF Partition Table
+# Name,   Type, SubType, Offset,  Size, Flags
+# bootloader.bin,,          0x1000, 32K
+# partition table,          0x8000, 4K
+
+nvs,      data, nvs,      0x9000,  20K,
+otadata,  data, ota,      0xe000,  8K,
+ota_0,    0,    ota_0,   0x10000,  1408K,
+ota_1,    0,    ota_1,  0x170000,  1408K,
+uf2,      app,  factory,0x2d0000,  256K,
+ffat,     data, fat,    0x310000,  960K,

variants/adafruit_feather_esp32s2/tinyuf2.bin

@@ -23,6 +23,7 @@ static const uint8_t RX = 7;
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 33;
 
+#define WIRE1_PIN_DEFINED 1             // See Wire.cpp at bool TwoWire::initPins(int sdaPin, int sclPin)
 static const uint8_t SDA1 = 22;
 static const uint8_t SCL1 = 19;
 

variants/adafruit_feather_esp32s2_reversetft/bootloader-tinyuf2.bin

@@ -29,6 +29,7 @@
 static const uint8_t SDA = 7;
 static const uint8_t SCL = 6;
 
+#define WIRE1_PIN_DEFINED 1             // See Wire.cpp at bool TwoWire::initPins(int sdaPin, int sclPin)
 static const uint8_t SDA1 = 41;
 static const uint8_t SCL1 = 40;