From 965e79409472429a3f5c6b8fec395266c7f63f63 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 14 Aug 2025 18:25:39 +0100 Subject: [PATCH] Rename Network to WLEDNetwork to prevent clash --- wled00/bus_manager.cpp | 2 +- wled00/e131.cpp | 4 ++-- wled00/improv.cpp | 6 +++--- wled00/json.cpp | 4 ++-- wled00/src/dependencies/espalexa/Espalexa.h | 4 ++-- wled00/src/dependencies/network/Network.cpp | 14 +++++++------- wled00/src/dependencies/network/Network.h | 4 ++-- wled00/wled.h | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp index f51302968..ab662ce1e 100644 --- a/wled00/bus_manager.cpp +++ b/wled00/bus_manager.cpp @@ -743,7 +743,7 @@ size_t BusNetwork::getPins(uint8_t* pinArray) const { #ifdef ARDUINO_ARCH_ESP32 void BusNetwork::resolveHostname() { static unsigned long nextResolve = 0; - if (Network.isConnected() && millis() > nextResolve && _hostname.length() > 0) { + if (WLEDNetwork.isConnected() && millis() > nextResolve && _hostname.length() > 0) { nextResolve = millis() + 600000; // resolve only every 10 minutes IPAddress clnt; if (strlen(cmDNS) > 0) clnt = MDNS.queryHost(_hostname); diff --git a/wled00/e131.cpp b/wled00/e131.cpp index 98cfe28fb..68ebfd191 100644 --- a/wled00/e131.cpp +++ b/wled00/e131.cpp @@ -407,7 +407,7 @@ void prepareArtnetPollReply(ArtPollReply *reply) { reply->reply_opcode = ARTNET_OPCODE_OPPOLLREPLY; - IPAddress localIP = Network.localIP(); + IPAddress localIP = WLEDNetwork.localIP(); for (unsigned i = 0; i < 4; i++) { reply->reply_ip[i] = localIP[i]; } @@ -482,7 +482,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 (unsigned i = 0; i < 4; i++) { reply->reply_bind_ip[i] = localIP[i]; diff --git a/wled00/improv.cpp b/wled00/improv.cpp index 0bc7a6698..1eb83627d 100644 --- a/wled00/improv.cpp +++ b/wled00/improv.cpp @@ -94,7 +94,7 @@ void handleImprovPacket() { case ImprovRPCType::Request_State: { unsigned improvState = 0x02; //authorized if (WLED_WIFI_CONFIGURED) improvState = 0x03; //provisioning - if (Network.isConnected()) improvState = 0x04; //provisioned + if (WLEDNetwork.isConnected()) improvState = 0x04; //provisioned sendImprovStateResponse(improvState, false); if (improvState == 0x04) sendImprovIPRPCResult(ImprovRPCType::Request_State); break; @@ -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(); unsigned 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}; diff --git a/wled00/json.cpp b/wled00/json.cpp index 441468102..a70837889 100644 --- a/wled00/json.cpp +++ b/wled00/json.cpp @@ -876,9 +876,9 @@ void serializeInfo(JsonObject root) root[F("product")] = F(WLED_PRODUCT_NAME); 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; diff --git a/wled00/src/dependencies/espalexa/Espalexa.h b/wled00/src/dependencies/espalexa/Espalexa.h index ae761e9fa..1e716ab45 100644 --- a/wled00/src/dependencies/espalexa/Espalexa.h +++ b/wled00/src/dependencies/espalexa/Espalexa.h @@ -215,7 +215,7 @@ private: void serveDescription() { EA_DEBUGLN("# Responding to description.xml ... #\n"); - IPAddress localIP = Network.localIP(); + IPAddress localIP = WLEDNetwork.localIP(); char s[16]; snprintf(s, sizeof(s), "%d.%d.%d.%d", localIP[0], localIP[1], localIP[2], localIP[3]); char buf[1024]; @@ -289,7 +289,7 @@ private: //respond to UDP SSDP M-SEARCH void respondToSearch() { - IPAddress localIP = Network.localIP(); + IPAddress localIP = WLEDNetwork.localIP(); char s[16]; sprintf(s, "%d.%d.%d.%d", localIP[0], localIP[1], localIP[2], localIP[3]); diff --git a/wled00/src/dependencies/network/Network.cpp b/wled00/src/dependencies/network/Network.cpp index dbc270788..ed1b6272c 100644 --- a/wled00/src/dependencies/network/Network.cpp +++ b/wled00/src/dependencies/network/Network.cpp @@ -1,6 +1,6 @@ #include "Network.h" -IPAddress NetworkClass::localIP() +IPAddress WLEDNetworkClass::localIP() { IPAddress localIP; #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_ETHERNET) @@ -17,7 +17,7 @@ IPAddress NetworkClass::localIP() return INADDR_NONE; } -IPAddress NetworkClass::subnetMask() +IPAddress WLEDNetworkClass::subnetMask() { #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_ETHERNET) if (ETH.localIP()[0] != 0) { @@ -30,7 +30,7 @@ IPAddress NetworkClass::subnetMask() return IPAddress(255, 255, 255, 0); } -IPAddress NetworkClass::gatewayIP() +IPAddress WLEDNetworkClass::gatewayIP() { #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_ETHERNET) if (ETH.localIP()[0] != 0) { @@ -43,7 +43,7 @@ IPAddress NetworkClass::gatewayIP() return INADDR_NONE; } -void NetworkClass::localMAC(uint8_t* MAC) +void WLEDNetworkClass::localMAC(uint8_t* MAC) { #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_ETHERNET) // ETH.macAddress(MAC); // Does not work because of missing ETHClass:: in ETH.ccp @@ -71,12 +71,12 @@ void NetworkClass::localMAC(uint8_t* MAC) return; } -bool NetworkClass::isConnected() +bool WLEDNetworkClass::isConnected() { return (WiFi.localIP()[0] != 0 && WiFi.status() == WL_CONNECTED) || isEthernet(); } -bool NetworkClass::isEthernet() +bool WLEDNetworkClass::isEthernet() { #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_ETHERNET) return (ETH.localIP()[0] != 0) && ETH.linkUp(); @@ -84,4 +84,4 @@ bool NetworkClass::isEthernet() return false; } -NetworkClass Network; \ No newline at end of file +WLEDNetworkClass WLEDNetwork; \ No newline at end of file diff --git a/wled00/src/dependencies/network/Network.h b/wled00/src/dependencies/network/Network.h index 9201d514e..f0197d30b 100644 --- a/wled00/src/dependencies/network/Network.h +++ b/wled00/src/dependencies/network/Network.h @@ -8,7 +8,7 @@ #ifndef Network_h #define Network_h -class NetworkClass +class WLEDNetworkClass { public: IPAddress localIP(); @@ -19,6 +19,6 @@ public: bool isEthernet(); }; -extern NetworkClass Network; +extern WLEDNetworkClass WLEDNetwork; #endif \ No newline at end of file diff --git a/wled00/wled.h b/wled00/wled.h index 3772fcd1f..3fc9f9719 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -1026,7 +1026,7 @@ WLED_GLOBAL volatile uint8_t jsonBufferLock _INIT(0); WLED_GLOBAL unsigned loops _INIT(0); #endif -#define WLED_CONNECTED (Network.isConnected()) +#define WLED_CONNECTED (WLEDNetwork.isConnected()) #ifndef WLED_AP_SSID_UNIQUE #define WLED_SET_AP_SSID() do { \