Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-27 19:57:38 +00:00
Code Issues Releases Activity

Merge pull request #5501 from TD-er/bugfix/fix_failed_esp8266_custom

Browse Source 
[ESP8266 build] Fix failing custom ESP8266 build using Custom.h
This commit is contained in:
TD-er
2026-02-23 14:33:30 +01:00
committed by GitHub
parent f1e935ec8a 05cfb52ee1
commit 7246fb93d2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp
+2 -2
View File
@@ -72,7 +72,7 @@ IPAddress NetworkLocalIP() { return WiFi.localIP(); }
IPAddress NetworkID()
{
const IPAddress subnet = NetworkSubnetMask();
IPAddress networkID = NetworkLocalIP();
IPAddress networkID = ESPEasy::net::NetworkLocalIP();
for (uint8_t i = 0; i < 4; ++i) {
networkID[i] &= subnet[i];
@@ -83,7 +83,7 @@ IPAddress NetworkID()
IPAddress NetworkBroadcast()
{
const IPAddress subnet = NetworkSubnetMask();
IPAddress broadcast = NetworkLocalIP();
IPAddress broadcast = ESPEasy::net::NetworkLocalIP();
for (uint8_t i = 0; i < 4; ++i) {
broadcast[i] |= ~subnet[i];
src/_C009.cpp
+1 -1
View File
@@ -150,7 +150,7 @@ bool do_process_c009_delay_queue(cpluginID_t cpluginID, const Queue_element_base
// embed IP, important if there is NAT/PAT
// char ipStr[20];
// IPAddress ip = NetworkLocalIP();
// IPAddress ip = ESPEasy::net::NetworkLocalIP();
// sprintf_P(ipStr, PSTR("%u.%u.%u.%u"), ip[0], ip[1], ip[2], ip[3]});
esp->write({F("ip"), formatIP(ESPEasy::net::NetworkLocalIP())});
}
src/src/Helpers/Networking.cpp
+3 -3
View File
@@ -559,7 +559,7 @@ void SSDP_schema() {
return;
}
const IPAddress ip = NetworkLocalIP();
const IPAddress ip = ESPEasy::net::NetworkLocalIP();
const uint32_t chipId = ESP.getChipId();
char uuid[64];
@@ -658,7 +658,7 @@ bool SSDP_begin() {
ip_addr_t ifaddr;
ifaddr.addr = NetworkLocalIP();
ifaddr.addr = ESPEasy::net::NetworkLocalIP();
ip_addr_t multicast_addr;
multicast_addr.addr = (uint32_t)SSDP_MULTICAST_ADDR;
@@ -705,7 +705,7 @@ bool SSDP_begin() {
Send SSDP messages (notify & responses)
\*********************************************************************************************/
void SSDP_send(uint8_t method) {
uint32_t ip = NetworkLocalIP();
uint32_t ip = ESPEasy::net::NetworkLocalIP();
// FIXME TD-er: Why create String objects of these flashstrings?
String _ssdp_response_template = F(