1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00

Even better fix of conflict with master branch.

This commit is contained in:
Anders 2019-11-01 12:37:09 +01:00
parent 7ca5a7e5bb
commit 8194197e9d
2 changed files with 2 additions and 2 deletions

View File

@ -589,7 +589,7 @@ void ESP8266WiFiMesh::attemptTransmission(const String &message, bool concluding
if(currentNetwork.networkIndex != NETWORK_INFO_DEFAULT_INT) if(currentNetwork.networkIndex != NETWORK_INFO_DEFAULT_INT)
{ {
verboseModePrint('(' + String(WiFi.RSSI(currentNetwork.networkIndex)) + String(F("dBm) ")) + verboseModePrint(String('(') + String(WiFi.RSSI(currentNetwork.networkIndex)) + String(F("dBm) ")) +
(WiFi.encryptionType(currentNetwork.networkIndex) == ENC_TYPE_NONE ? String(F("open")) : ""), false); (WiFi.encryptionType(currentNetwork.networkIndex) == ENC_TYPE_NONE ? String(F("open")) : ""), false);
} }

View File

@ -286,7 +286,7 @@ void MeshBackendBase::printAPInfo(const NetworkInfoBase &apNetworkInfo)
if(apNetworkInfo.RSSI() != NetworkInfoBase::defaultRSSI) if(apNetworkInfo.RSSI() != NetworkInfoBase::defaultRSSI)
{ {
verboseModePrint('(' + String(apNetworkInfo.RSSI()) + String(F("dBm) ")) + verboseModePrint(String('(') + String(apNetworkInfo.RSSI()) + String(F("dBm) ")) +
(apNetworkInfo.encryptionType() == ENC_TYPE_NONE ? String(F("open")) : ""), false); (apNetworkInfo.encryptionType() == ENC_TYPE_NONE ? String(F("open")) : ""), false);
} }