Rename Network to WLEDNetwork due to clash with IDF upgrade

Author: netmindz

wled00/e131.cpp

@@ -425,7 +425,7 @@ void prepareArtnetPollReply(ArtPollReply *reply) {
 
   reply->reply_opcode = ARTNET_OPCODE_OPPOLLREPLY;
 
-  IPAddress localIP = Network.localIP();
+  IPAddress localIP = WLEDNetwork.localIP();
   for (uint8_t i = 0; i < 4; i++) {
     reply->reply_ip[i] = localIP[i];
   }
@@ -500,7 +500,7 @@ void prepareArtnetPollReply(ArtPollReply *reply) {
   // A DMX to / from Art-Net device
   reply->reply_style = 0x00;
 
-  Network.localMAC(reply->reply_mac);
+  WLEDNetwork.localMAC(reply->reply_mac);
 
   for (uint8_t i = 0; i < 4; i++) {
     reply->reply_bind_ip[i] = localIP[i];

wled00/improv.cpp

@@ -178,10 +178,10 @@ void sendImprovRPCResult(ImprovRPCType type, uint8_t n_strings, const char **str
 }
 
 void sendImprovIPRPCResult(ImprovRPCType type) {
-  if (Network.isConnected())
+  if (WLEDNetwork.isConnected())
   {
     char urlStr[64];
-    IPAddress localIP = Network.localIP();
+    IPAddress localIP = WLEDNetwork.localIP();
     uint8_t len = sprintf(urlStr, "http://%d.%d.%d.%d", localIP[0], localIP[1], localIP[2], localIP[3]);
     if (len > 24) return; //sprintf fail?
     const char *str[1] = {urlStr};

wled00/json.cpp

@@ -1196,9 +1196,9 @@ void serializeInfo(JsonObject root)
   root[F("product")] = F(WLED_PRODUCT_NAME); //WLEDMM + Moustachauve/Wled-Native
   root["mac"] = escapedMac;
   char s[16] = "";
-  if (Network.isConnected())
+  if (WLEDNetwork.isConnected())
   {
-    IPAddress localIP = Network.localIP();
+    IPAddress localIP = WLEDNetwork.localIP();
     sprintf(s, "%d.%d.%d.%d", localIP[0], localIP[1], localIP[2], localIP[3]);
   }
   root["ip"] = s;

wled00/src/dependencies/network/Network.cpp

@@ -88,4 +88,4 @@ bool NetworkClass::isEthernet()
   return false;
 }
 
-NetworkClass Network;
+NetworkClass WLEDNetwork;

wled00/src/dependencies/network/Network.h

@@ -19,6 +19,6 @@ class NetworkClass
   bool isEthernet();
 };
 
-extern NetworkClass Network;
+extern NetworkClass WLEDNetwork;
 
 #endif

wled00/udp.cpp

@@ -139,7 +139,7 @@ void notify(byte callMode, bool followUp)
   //next value to be added has index: udpOut[offs + 0]
 
   IPAddress broadcastIp;
-  broadcastIp = ~uint32_t(Network.subnetMask()) | uint32_t(Network.gatewayIP());
+  broadcastIp = ~uint32_t(WLEDNetwork.subnetMask()) | uint32_t(WLEDNetwork.gatewayIP());
 
   if (0 != notifierUdp.beginPacket(broadcastIp, udpPort)) { // WLEDMM beginPacket == 0 --> error
     notifierUdp.write(udpOut, WLEDPACKETSIZE);
@@ -319,7 +319,7 @@ void handleNotifications()
   if (!(receiveNotifications || receiveDirect)) {return;}
 #endif
 
-  localIP = Network.localIP();
+  localIP = WLEDNetwork.localIP();
   //notifier and UDP realtime
 #ifdef ARDUINO_ARCH_ESP32
   if (!packetSize || packetSize > UDP_IN_MAXSIZE) {notifierUdp.flush(); notifier2Udp.flush(); return;}
@@ -697,7 +697,7 @@ void sendSysInfoUDP()
 {
   if (!udp2Connected) return;
 
-  IPAddress ip = Network.localIP();
+  IPAddress ip = WLEDNetwork.localIP();
   if (!ip || ip == IPAddress(255,255,255,255)) ip = IPAddress(4,3,2,1);
 
   // TODO: make a nice struct of it and clean up

wled00/wled.cpp

@@ -1347,7 +1347,7 @@ void WLED::handleConnection()
     wasConnected = false;
     return;
   }
-  if (!Network.isConnected()) {
+  if (!WLEDNetwork.isConnected()) {
     if (interfacesInited) {
       USER_PRINTLN(F("Disconnected!"));
       interfacesInited = false;
@@ -1370,8 +1370,8 @@ void WLED::handleConnection()
   } else if (!interfacesInited) { //newly connected
     USER_PRINTLN("");
     USER_PRINT(F("Connected! IP address: http://"));
-    USER_PRINT(Network.localIP());
-    if (Network.isEthernet()) {
+    USER_PRINT(WLEDNetwork.localIP());
+    if (WLEDNetwork.isEthernet()) {
      #if ESP32
      USER_PRINTLN(" via Ethernet (disabling WiFi)");
      WiFi.disconnect(true);

wled00/xml.cpp

@@ -82,7 +82,7 @@ void URL_response(AsyncWebServerRequest *request)
 
   char s[16];
   oappend(SET_F("http://"));
-  IPAddress localIP = Network.localIP();
+  IPAddress localIP = WLEDNetwork.localIP();
   sprintf(s, "%d.%d.%d.%d", localIP[0], localIP[1], localIP[2], localIP[3]);
   oappend(s);
 
@@ -359,10 +359,10 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
     oappend(SET_F("document.getElementById('ethd').style.display='none';"));
     #endif
 
-    if (Network.isConnected()) //is connected
+    if (WLEDNetwork.isConnected()) //is connected
     {
       char s[32];
-      IPAddress localIP = Network.localIP();
+      IPAddress localIP = WLEDNetwork.localIP();
       sprintf(s, "%d.%d.%d.%d", localIP[0], localIP[1], localIP[2], localIP[3]);
 
       #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_ETHERNET)