arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-13 13:01:55 +03:00
Code Activity

Fix conflict with master branch.

Browse Source 
- Avoid single character String concatenations done via String literals instead of char literals, as this is inefficient because of temporary String creations (#6571).
This commit is contained in:
Anders
2019-11-01 12:17:24 +01:00
parent f8ec4f1c72
commit 7ca5a7e5bb
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/ESP8266WiFiMesh/src/ESP8266WiFiMesh.cpp
View File

@ -372,7 +372,7 @@ transmission_status_t ESP8266WiFiMesh::exchangeInfo(WiFiClient &currClient)
{
verboseModePrint("Transmitting"); // Not storing strings in flash (via F()) to avoid performance impacts when using the string.
currClient.print(getMessage() + "\r");
currClient.print(getMessage() + '\r');
yield();
if (!waitForClientTransmission(currClient, _stationModeTimeoutMs))
@ -585,11 +585,11 @@ void ESP8266WiFiMesh::attemptTransmission(const String &message, bool concluding
if(_verboseMode) // Avoid string generation if not required
{
verboseModePrint(String(F("AP acquired: ")) + currentSSID + String(F(", Ch:")) + String(currentWiFiChannel) + " ", false);
verboseModePrint(String(F("AP acquired: ")) + currentSSID + String(F(", Ch:")) + String(currentWiFiChannel) + ' ', false);
if(currentNetwork.networkIndex != NETWORK_INFO_DEFAULT_INT)
{
verboseModePrint("(" + String(WiFi.RSSI(currentNetwork.networkIndex)) + String(F("dBm) ")) +
verboseModePrint('(' + String(WiFi.RSSI(currentNetwork.networkIndex)) + String(F("dBm) ")) +
(WiFi.encryptionType(currentNetwork.networkIndex) == ENC_TYPE_NONE ? String(F("open")) : ""), false);
}
@ -665,7 +665,7 @@ void ESP8266WiFiMesh::acceptRequest()
if (_client.connected())
{
verboseModePrint("Responding"); // Not storing strings in flash (via F()) to avoid performance impacts when using the string.
_client.print(response + "\r");
_client.print(response + '\r');
_client.flush();
yield();
}