NetworkSettings: Optimize applyConfig function

Also replace all print and println by printf
This commit is contained in:
Thomas Basler
2025-04-12 11:00:28 +02:00
parent 852649fd86
commit b911ba09a4

View File

@@ -279,20 +279,30 @@ void NetworkSettingsClass::loop()
void NetworkSettingsClass::applyConfig() void NetworkSettingsClass::applyConfig()
{ {
setHostname(); setHostname();
if (!strcmp(Configuration.get().WiFi.Ssid, "")) {
const auto& config = Configuration.get().WiFi;
// Check if SSID is empty
if (!strcmp(config.Ssid, "")) {
return; return;
} }
MessageOutput.print("Configuring WiFi STA using ");
if (strcmp(WiFi.SSID().c_str(), Configuration.get().WiFi.Ssid) || strcmp(WiFi.psk().c_str(), Configuration.get().WiFi.Password)) { const bool newCredentials = strcmp(WiFi.SSID().c_str(), config.Ssid) || strcmp(WiFi.psk().c_str(), config.Password);
MessageOutput.print("new credentials... ");
WiFi.begin( MessageOutput.printf("Start configuring WiFi STA using %s credentials\r\n",
Configuration.get().WiFi.Ssid, newCredentials ? "new" : "existing");
Configuration.get().WiFi.Password);
bool success = false;
if (newCredentials) {
success = WiFi.begin(
config.Ssid,
config.Password) != WL_CONNECT_FAILED;
} else { } else {
MessageOutput.print("existing credentials... "); success = WiFi.begin() != WL_CONNECT_FAILED;
WiFi.begin();
} }
MessageOutput.println("done");
MessageOutput.printf("Configuring WiFi %s\r\n", success ? "done" : "failed");
setStaticIp(); setStaticIp();
} }