Skip to content

Commit 8194197

Browse files
committed
Even better fix of conflict with master branch.
1 parent 7ca5a7e commit 8194197

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

libraries/ESP8266WiFiMesh/src/ESP8266WiFiMesh.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ void ESP8266WiFiMesh::attemptTransmission(const String &message, bool concluding
589589

590590
if(currentNetwork.networkIndex != NETWORK_INFO_DEFAULT_INT)
591591
{
592-
verboseModePrint('(' + String(WiFi.RSSI(currentNetwork.networkIndex)) + String(F("dBm) ")) +
592+
verboseModePrint(String('(') + String(WiFi.RSSI(currentNetwork.networkIndex)) + String(F("dBm) ")) +
593593
(WiFi.encryptionType(currentNetwork.networkIndex) == ENC_TYPE_NONE ? String(F("open")) : ""), false);
594594
}
595595

libraries/ESP8266WiFiMesh/src/MeshBackendBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ void MeshBackendBase::printAPInfo(const NetworkInfoBase &apNetworkInfo)
286286

287287
if(apNetworkInfo.RSSI() != NetworkInfoBase::defaultRSSI)
288288
{
289-
verboseModePrint('(' + String(apNetworkInfo.RSSI()) + String(F("dBm) ")) +
289+
verboseModePrint(String('(') + String(apNetworkInfo.RSSI()) + String(F("dBm) ")) +
290290
(apNetworkInfo.encryptionType() == ENC_TYPE_NONE ? String(F("open")) : ""), false);
291291
}
292292

0 commit comments

Comments
 (0)