Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace all Serial. with Log->

Browse Source
This commit is contained in:
technyon
2022-12-23 23:11:04 +01:00
parent 3a5f14dc18
commit e2057e024b
6 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
networkDevices/WifiDevice.cpp
View File

@@ -21,22 +21,22 @@ WifiDevice::WifiDevice(const String& hostname, Preferences* _preferences)
if(caLength > 1) // length is 1 when empty
{
Serial.println(F("MQTT over TLS."));
Serial.println(_ca);
Log->println(F("MQTT over TLS."));
Log->println(_ca);
_wifiClientSecure = new WiFiClientSecure();
_wifiClientSecure->setCACert(_ca);
if(crtLength > 1 && keyLength > 1) // length is 1 when empty
{
Serial.println(F("MQTT with client certificate."));
Serial.println(_cert);
Serial.println(_key);
Log->println(F("MQTT with client certificate."));
Log->println(_cert);
Log->println(_key);
_wifiClientSecure->setCertificate(_cert);
_wifiClientSecure->setPrivateKey(_key);
}
_mqttClient = new PubSubClient(*_wifiClientSecure);
} else
{
Serial.println(F("MQTT without TLS."));
Log->println(F("MQTT without TLS."));
_wifiClient = new WiFiClient();
_mqttClient = new PubSubClient(*_wifiClient);
}
@@ -67,7 +67,7 @@ void WifiDevice::initialize()
if(_startAp)
{
Serial.println(F("Opening WiFi configuration portal."));
Log->println(F("Opening WiFi configuration portal."));
res = _wm.startConfigPortal();
}
else
@@ -76,13 +76,13 @@ void WifiDevice::initialize()
}
if(!res) {
Serial.println(F("Failed to connect. Wait for ESP restart."));
Log->println(F("Failed to connect. Wait for ESP restart."));
delay(1000);
ESP.restart();
}
else {
Serial.print(F("WiFi connected: "));
Serial.println(WiFi.localIP().toString());
Log->print(F("WiFi connected: "));
Log->println(WiFi.localIP().toString());
}
if(_restartOnDisconnect)
@@ -108,10 +108,10 @@ void WifiDevice::printError()
{
char lastError[100];
_wifiClientSecure->lastError(lastError,100);
Serial.println(lastError);
Log->println(lastError);
}
Serial.print(F("Free Heap: "));
Serial.println(ESP.getFreeHeap());
Log->print(F("Free Heap: "));
Log->println(ESP.getFreeHeap());
}
bool WifiDevice::isConnected()