Merge branch 'espressif:master' into cflags--WError

Author: SuGlider

libraries/WiFi/src/WiFiAP.h

@@ -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/Wire/src/Wire.cpp

@@ -77,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
             }
@@ -94,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
             }

variants/Microduino-esp32/pins_arduino.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/adafruit_qtpy_esp32/pins_arduino.h

@@ -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_qtpy_esp32s2/pins_arduino.h

@@ -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;
 

variants/adafruit_qtpy_esp32s3_nopsram/pins_arduino.h

@@ -30,6 +30,7 @@ static const uint8_t RX = 16;
 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;
 

variants/esp32micromod/pins_arduino.h

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

variants/openkb/pins_arduino.h

@@ -81,6 +81,7 @@ static const uint8_t OUTPUT2 = 27;
 static const uint8_t SDA0 = 21;
 static const uint8_t SCL0 = 22;
 
+#define WIRE1_PIN_DEFINED 1             // See Wire.cpp at bool TwoWire::initPins(int sdaPin, int sclPin)
 static const uint8_t SDA1 = 4;
 static const uint8_t SCL1 = 5;