mirror
/
WLED
kopia lustrzana https://github.com/Aircoookie/WLED
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Rename Network to WLEDNetwork to prevent clash

V5
Will Tatam 2025-08-16 11:57:50 +01:00
rodzic 1de8c2e79b
commit 2c0259f214
3 zmienionych plików z 5 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
usermods/ST7789_display/ST7789_display.cpp
Wyświetl plik

@ -196,7 +196,7 @@ class St7789DisplayUsermod : public Usermod {
// Check if values which are shown on display changed from the last time. // Check if values which are shown on display changed from the last time.
if ((((apActive) ? String(apSSID) : WiFi.SSID()) != knownSsid) || if ((((apActive) ? String(apSSID) : WiFi.SSID()) != knownSsid) ||
(knownIp != (apActive ? IPAddress(4, 3, 2, 1) : Network.localIP())) || (knownIp != (apActive ? IPAddress(4, 3, 2, 1) : WLEDNetwork.localIP())) ||
(knownBrightness != bri) || (knownBrightness != bri) ||
(knownEffectSpeed != strip.getMainSegment().speed) || (knownEffectSpeed != strip.getMainSegment().speed) ||
(knownEffectIntensity != strip.getMainSegment().intensity) || (knownEffectIntensity != strip.getMainSegment().intensity) ||

6
usermods/quinled-an-penta/quinled-an-penta.cpp
Wyświetl plik

@ -234,11 +234,11 @@ class QuinLEDAnPentaUsermod : public Usermod
bool oledCheckForNetworkChanges() bool oledCheckForNetworkChanges()
{ {
if (lastKnownNetworkConnected != Network.isConnected() || lastKnownIp != Network.localIP() if (lastKnownNetworkConnected != WLEDNetwork.isConnected() || lastKnownIp != WLEDNetwork.localIP()
|| lastKnownWiFiConnected != WiFi.isConnected() || lastKnownSsid != WiFi.SSID() || lastKnownWiFiConnected != WiFi.isConnected() || lastKnownSsid != WiFi.SSID()
|| lastKnownApActive != apActive || lastKnownApSsid != apSSID || lastKnownApPass != apPass || lastKnownApChannel != apChannel) { || lastKnownApActive != apActive || lastKnownApSsid != apSSID || lastKnownApPass != apPass || lastKnownApChannel != apChannel) {
lastKnownNetworkConnected = Network.isConnected(); lastKnownNetworkConnected = WLEDNetwork.isConnected();
lastKnownIp = Network.localIP(); lastKnownIp = WLEDNetwork.localIP();
lastKnownWiFiConnected = WiFi.isConnected(); lastKnownWiFiConnected = WiFi.isConnected();
lastKnownSsid = WiFi.SSID(); lastKnownSsid = WiFi.SSID();
lastKnownApActive = apActive; lastKnownApActive = apActive;

2
usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.cpp
Wyświetl plik

@ -264,7 +264,7 @@ void FourLineDisplayUsermod::setup() {
// interfaces here // interfaces here
void FourLineDisplayUsermod::connected() { void FourLineDisplayUsermod::connected() {
knownSsid = WiFi.SSID(); //apActive ? apSSID : WiFi.SSID(); //apActive ? WiFi.softAPSSID() : knownSsid = WiFi.SSID(); //apActive ? apSSID : WiFi.SSID(); //apActive ? WiFi.softAPSSID() :
knownIp = Network.localIP(); //apActive ? IPAddress(4, 3, 2, 1) : Network.localIP(); knownIp = WLEDNetwork.localIP(); //apActive ? IPAddress(4, 3, 2, 1) : WLEDNetwork.localIP();
networkOverlay(PSTR("NETWORK INFO"),7000); networkOverlay(PSTR("NETWORK INFO"),7000);
} }