Merge branch 'master' into feat/zigbee-thermostat-humidity

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

cores/esp32/esp32-hal-i2c-ng.c

@@ -156,6 +156,9 @@ esp_err_t i2cInit(uint8_t i2c_num, int8_t sda, int8_t scl, uint32_t frequency) {
     }
   }
 
+  // Silence messages coming from the IDF driver
+  esp_log_level_set("i2c.master", ESP_LOG_NONE);
+
 init_fail:
 #if !CONFIG_DISABLE_HAL_LOCKS
   //release lock

libraries/ESPmDNS/src/ESPmDNS.h

@@ -127,9 +127,7 @@ class MDNSResponder {
   mdns_txt_item_t *_getResultTxt(int idx, int txtIdx);
 };
 
-#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_MDNS)
 extern MDNSResponder MDNS;
-#endif
 
 #endif  /* CONFIG_MDNS_MAX_INTERFACES */
 #endif  //ESP32MDNS_H

libraries/Ethernet/src/ETH.cpp

@@ -1174,6 +1174,8 @@ size_t ETHClass::printDriverInfo(Print &out) const {
   return bytes;
 }
 
+#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_ETH)
 ETHClass ETH;
+#endif
 
 #endif /* CONFIG_ETH_ENABLED */

libraries/Network/src/NetworkManager.h

@@ -31,6 +31,4 @@ class NetworkManager : public NetworkEvents, public Printable {
   }
 };
 
-#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_NETWORK)
 extern NetworkManager Network;
-#endif

libraries/PPP/src/PPP.cpp

@@ -763,6 +763,8 @@ size_t PPPClass::printDriverInfo(Print &out) const {
   return bytes;
 }
 
+#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_PPP)
 PPPClass PPP;
+#endif
 
 #endif /* CONFIG_LWIP_PPP_SUPPORT */

libraries/WiFi/src/WiFi.h

@@ -72,8 +72,6 @@ class WiFiClass : public WiFiGenericClass, public WiFiSTAClass, public WiFiScanC
   bool isProvEnabled();
 };
 
-#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_WIFI)
 extern WiFiClass WiFi;
-#endif
 
 #endif /* SOC_WIFI_SUPPORTED */