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

- Fix even more merge conflicts.

Browse Source
This commit is contained in:
Anders 2020-03-05 15:39:49 +01:00
parent 16801f3dac
commit 1dcd4c4a7b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ ESP8266WiFiMesh::ESP8266WiFiMesh(ESP8266WiFiMesh::requestHandlerType requestHand
const String &nodeID, bool verboseMode, uint8 meshWiFiChannel, uint16_t serverPort) const String &nodeID, bool verboseMode, uint8 meshWiFiChannel, uint16_t serverPort)
: _server(serverPort) : _server(serverPort)
{ {
updateNetworkNames(meshName, (nodeID != "" ? nodeID : TypeCast::uint64ToString(ESP.getChipId()))); updateNetworkNames(meshName, (!nodeID.isEmpty() ? nodeID : TypeCast::uint64ToString(ESP.getChipId())));
_requestHandler = requestHandler; _requestHandler = requestHandler;
_responseHandler = responseHandler; _responseHandler = responseHandler;
setWiFiChannel(meshWiFiChannel); setWiFiChannel(meshWiFiChannel);