From 8194197e9de4a2c13d44fccfcb089aedae684264 Mon Sep 17 00:00:00 2001 From: Anders Date: Fri, 1 Nov 2019 12:37:09 +0100 Subject: [PATCH] Even better fix of conflict with master branch. --- libraries/ESP8266WiFiMesh/src/ESP8266WiFiMesh.cpp | 2 +- libraries/ESP8266WiFiMesh/src/MeshBackendBase.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/ESP8266WiFiMesh/src/ESP8266WiFiMesh.cpp b/libraries/ESP8266WiFiMesh/src/ESP8266WiFiMesh.cpp index f4839e366..583d34564 100644 --- a/libraries/ESP8266WiFiMesh/src/ESP8266WiFiMesh.cpp +++ b/libraries/ESP8266WiFiMesh/src/ESP8266WiFiMesh.cpp @@ -589,7 +589,7 @@ void ESP8266WiFiMesh::attemptTransmission(const String &message, bool concluding 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); } diff --git a/libraries/ESP8266WiFiMesh/src/MeshBackendBase.cpp b/libraries/ESP8266WiFiMesh/src/MeshBackendBase.cpp index 30ff9fd61..4abe1567b 100644 --- a/libraries/ESP8266WiFiMesh/src/MeshBackendBase.cpp +++ b/libraries/ESP8266WiFiMesh/src/MeshBackendBase.cpp @@ -286,7 +286,7 @@ void MeshBackendBase::printAPInfo(const NetworkInfoBase &apNetworkInfo) 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); }