From 07ab6aa3ea9bf9836d6de04a2ee92a3e7fc854a4 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 14 Aug 2025 18:59:06 +0100 Subject: [PATCH] Rename Network to WLEDNetwork to prevent clash --- wled00/network.cpp | 2 +- wled00/src/dependencies/e131/ESPAsyncE131.cpp | 2 +- wled00/src/dependencies/espalexa/Espalexa.h | 2 +- wled00/udp.cpp | 6 +++--- wled00/wled.cpp | 16 ++++++++-------- wled00/wled_server.cpp | 2 +- wled00/xml.cpp | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/wled00/network.cpp b/wled00/network.cpp index 79209ff5e..de326bbee 100644 --- a/wled00/network.cpp +++ b/wled00/network.cpp @@ -358,7 +358,7 @@ void WiFiEvent(WiFiEvent_t event) DEBUG_PRINTF_P(PSTR("WiFi-E: AP Client Connected (%d) @ %lus.\n"), (int)apClients, millis()/1000); break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: - DEBUG_PRINT(F("WiFi-E: IP address: ")); DEBUG_PRINTLN(Network.localIP()); + DEBUG_PRINT(F("WiFi-E: IP address: ")); DEBUG_PRINTLN(WLEDNetwork.localIP()); break; case ARDUINO_EVENT_WIFI_STA_CONNECTED: // followed by IDLE and SCAN_DONE diff --git a/wled00/src/dependencies/e131/ESPAsyncE131.cpp b/wled00/src/dependencies/e131/ESPAsyncE131.cpp index 75d6b8dc2..f086652d2 100644 --- a/wled00/src/dependencies/e131/ESPAsyncE131.cpp +++ b/wled00/src/dependencies/e131/ESPAsyncE131.cpp @@ -76,7 +76,7 @@ bool ESPAsyncE131::initMulticast(uint16_t port, uint16_t universe, uint8_t n) { ip4_addr_t ifaddr; ip4_addr_t multicast_addr; - ifaddr.addr = static_cast(Network.localIP()); + ifaddr.addr = static_cast(WLEDNetwork.localIP()); for (uint8_t i = 1; i < n; i++) { multicast_addr.addr = static_cast(IPAddress(239, 255, (((universe + i) >> 8) & 0xff), (((universe + i) >> 0) diff --git a/wled00/src/dependencies/espalexa/Espalexa.h b/wled00/src/dependencies/espalexa/Espalexa.h index 1e716ab45..82934c8a9 100644 --- a/wled00/src/dependencies/espalexa/Espalexa.h +++ b/wled00/src/dependencies/espalexa/Espalexa.h @@ -344,7 +344,7 @@ public: #ifdef ARDUINO_ARCH_ESP32 udpConnected = espalexaUdp.beginMulticast(IPAddress(239, 255, 255, 250), 1900); #else - udpConnected = espalexaUdp.beginMulticast(Network.localIP(), IPAddress(239, 255, 255, 250), 1900); + udpConnected = espalexaUdp.beginMulticast(WLEDNetwork.localIP(), IPAddress(239, 255, 255, 250), 1900); #endif if (udpConnected){ diff --git a/wled00/udp.cpp b/wled00/udp.cpp index bdb60c363..4b96580da 100644 --- a/wled00/udp.cpp +++ b/wled00/udp.cpp @@ -196,7 +196,7 @@ void notify(byte callMode, bool followUp) #endif { DEBUG_PRINTLN(F("UDP sending packet.")); - IPAddress broadcastIp = ~uint32_t(Network.subnetMask()) | uint32_t(Network.gatewayIP()); + IPAddress broadcastIp = ~uint32_t(WLEDNetwork.subnetMask()) | uint32_t(WLEDNetwork.gatewayIP()); notifierUdp.beginPacket(broadcastIp, udpPort); notifierUdp.write(udpOut, WLEDPACKETSIZE); // TODO: add actual used buffer size notifierUdp.endPacket(); @@ -516,7 +516,7 @@ void handleNotifications() } } - localIP = Network.localIP(); + localIP = WLEDNetwork.localIP(); //notifier and UDP realtime if (!packetSize || packetSize > UDP_IN_MAXSIZE) return; if (!isSupp && notifierUdp.remoteIP() == localIP) return; //don't process broadcasts we send ourselves @@ -707,7 +707,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 diff --git a/wled00/wled.cpp b/wled00/wled.cpp index 5826b9ac3..4d535c285 100644 --- a/wled00/wled.cpp +++ b/wled00/wled.cpp @@ -109,7 +109,7 @@ void WLED::loop() { if (apActive) dnsServer.processNextRequest(); #ifdef WLED_ENABLE_AOTA - if (Network.isConnected() && aOtaEnabled && !otaLock && correctPIN) ArduinoOTA.handle(); + if (WLEDNetwork.isConnected() && aOtaEnabled && !otaLock && correctPIN) ArduinoOTA.handle(); #endif handleNightlight(); yield(); @@ -262,7 +262,7 @@ void WLED::loop() lastWifiState = WiFi.status(); DEBUG_PRINTF_P(PSTR("State time: %lu\n"), wifiStateChangedTime); DEBUG_PRINTF_P(PSTR("NTP last sync: %lu\n"), ntpLastSyncTime); - DEBUG_PRINTF_P(PSTR("Client IP: %u.%u.%u.%u\n"), Network.localIP()[0], Network.localIP()[1], Network.localIP()[2], Network.localIP()[3]); + DEBUG_PRINTF_P(PSTR("Client IP: %u.%u.%u.%u\n"), WLEDNetwork.localIP()[0], WLEDNetwork.localIP()[1], WLEDNetwork.localIP()[2], WLEDNetwork.localIP()[3]); if (loops > 0) { // avoid division by zero DEBUG_PRINTF_P(PSTR("Loops/sec: %u\n"), loops / 30); DEBUG_PRINTF_P(PSTR("Loop time[ms]: %u/%lu\n"), avgLoopMillis/loops, maxLoopMillis); @@ -700,7 +700,7 @@ void WLED::initInterfaces() DEBUG_PRINTLN(F("Init STA interfaces")); #ifndef WLED_DISABLE_HUESYNC - IPAddress ipAddress = Network.localIP(); + IPAddress ipAddress = WLEDNetwork.localIP(); if (hueIP[0] == 0) { hueIP[0] = ipAddress[0]; hueIP[1] = ipAddress[1]; @@ -786,7 +786,7 @@ void WLED::handleConnection() if (stac != stacO) { stacO = stac; DEBUG_PRINTF_P(PSTR("Connected AP clients: %d\n"), (int)stac); - if (!Network.isConnected() && wifiConfigured) { // trying to connect, but not connected + if (!WLEDNetwork.isConnected() && wifiConfigured) { // trying to connect, but not connected if (stac) WiFi.disconnect(); // disable search so that AP can work else @@ -795,7 +795,7 @@ void WLED::handleConnection() } } - if (!Network.isConnected()) { + if (!WLEDNetwork.isConnected()) { if (interfacesInited) { if (scanDone && multiWiFi.size() > 1) { DEBUG_PRINTLN(F("WiFi scan initiated on disconnect.")); @@ -839,7 +839,7 @@ void WLED::handleConnection() } else if (!interfacesInited) { //newly connected DEBUG_PRINTLN(); DEBUG_PRINT(F("Connected! IP address: ")); - DEBUG_PRINTLN(Network.localIP()); + DEBUG_PRINTLN(WLEDNetwork.localIP()); if (improvActive) { if (improvError == 3) sendImprovStateResponse(0x00, true); sendImprovStateResponse(0x04); @@ -861,7 +861,7 @@ void WLED::handleConnection() } // If status LED pin is allocated for other uses, does nothing -// else blink at 1Hz when Network.isConnected() is false (no WiFi, ?? no Ethernet ??) +// else blink at 1Hz when WLEDNetwork.isConnected() is false (no WiFi, ?? no Ethernet ??) // else blink at 2Hz when MQTT is enabled but not connected // else turn the status LED off #if defined(STATUSLED) @@ -875,7 +875,7 @@ void WLED::handleStatusLED() } #endif - if (Network.isConnected()) { + if (WLEDNetwork.isConnected()) { c = RGBW32(0,255,0,0); ledStatusType = 2; } else if (WLED_MQTT_CONNECTED) { diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp index f12b00ab2..20a6f185b 100644 --- a/wled00/wled_server.cpp +++ b/wled00/wled_server.cpp @@ -44,7 +44,7 @@ static bool inSubnet(const IPAddress &ip, const IPAddress &subnet, const IPAddre } static bool inSameSubnet(const IPAddress &client) { - return inSubnet(client, Network.localIP(), Network.subnetMask()); + return inSubnet(client, WLEDNetwork.localIP(), WLEDNetwork.subnetMask()); } static bool inLocalSubnet(const IPAddress &client) { diff --git a/wled00/xml.cpp b/wled00/xml.cpp index 987167d79..e4f165732 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -233,10 +233,10 @@ void getSettingsJS(byte subPage, Print& settingsScript) settingsScript.print(F("gId('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)