Mirrors/OpenDTU
2
0
Fork 0
mirror of https://github.com/tbnobody/OpenDTU.git synced 2025-12-11 01:10:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

NetworkSettings: Optimize setStaticIp function

Browse Source 
Also replace all print and println by printf
This commit is contained in:
Thomas Basler
2025-04-12 11:13:56 +02:00
parent b911ba09a4
commit 650f33f7f7
1 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/NetworkSettings.cpp
View File

@@ -332,37 +332,42 @@ void NetworkSettingsClass::setHostname()
void NetworkSettingsClass::setStaticIp()
{
if (_networkMode == network_mode::Undefined) {
return;
}
const auto& config = Configuration.get().WiFi;
const char* mode = (_networkMode == network_mode::WiFi) ? "WiFi" : "Ethernet";
const char* ipType = config.Dhcp ? "DHCP" : "static";
MessageOutput.printf("Start configuring %s %s IP...\r\n", mode, ipType);
bool success = false;
if (_networkMode == network_mode::WiFi) {
if (Configuration.get().WiFi.Dhcp) {
MessageOutput.print("Configuring WiFi STA DHCP IP... ");
WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE);
MessageOutput.println("done");
if (config.Dhcp) {
success = WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE);
} else {
MessageOutput.print("Configuring WiFi STA static IP... ");
WiFi.config(
IPAddress(Configuration.get().WiFi.Ip),
IPAddress(Configuration.get().WiFi.Gateway),
IPAddress(Configuration.get().WiFi.Netmask),
IPAddress(Configuration.get().WiFi.Dns1),
IPAddress(Configuration.get().WiFi.Dns2));
MessageOutput.println("done");
success = WiFi.config(
IPAddress(config.Ip),
IPAddress(config.Gateway),
IPAddress(config.Netmask),
IPAddress(config.Dns1),
IPAddress(config.Dns2));
}
} else if (_networkMode == network_mode::Ethernet) {
if (Configuration.get().WiFi.Dhcp) {
MessageOutput.print("Configuring Ethernet DHCP IP... ");
ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE);
MessageOutput.println("done");
if (config.Dhcp) {
success = ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE);
} else {
MessageOutput.print("Configuring Ethernet static IP... ");
ETH.config(
IPAddress(Configuration.get().WiFi.Ip),
IPAddress(Configuration.get().WiFi.Gateway),
IPAddress(Configuration.get().WiFi.Netmask),
IPAddress(Configuration.get().WiFi.Dns1),
IPAddress(Configuration.get().WiFi.Dns2));
MessageOutput.println("done");
success = ETH.config(
IPAddress(config.Ip),
IPAddress(config.Gateway),
IPAddress(config.Netmask),
IPAddress(config.Dns1),
IPAddress(config.Dns2));
}
}
MessageOutput.printf("Configure IP %s\r\n", success ? "done" : "failed");
}
IPAddress NetworkSettingsClass::localIP() const