- Rework ExpiringTimeTracker to be based on PolledTimeout.

- Ensure espnowDelay and floodingMeshDelay always performs maintenance.

- Rework MutexTracker to use shared_ptr.

- Change enums to enum class.

- Change typedef to using.

- Add HeapMonitor class.

- Make _messageIDs be a map instead of an unordered_map to reduce heap usage.

- Use the possibly broken wifi_country ESP8266 API to check for legal WiFi channels when setting WiFi channels.

- Make MessageData, RequestData and ResponseData contain a TimeTracker rather than inherit from TimeTracker.

- Add deprecated attribute to TransmissionResult.

- Remove superfluous elses.

- Reduce cyclomatic complexity.

- Change postfix ++ and -- to prefix.

- Generalize getEncryptedConnectionIterator method.

- Increase code NRVO compatibility.

- Change _connectionAttemptTimeoutMs type from int32_t to uint32_t.

- Add deprecated attribute to ESP8266WiFiMesh.

- Add some constness to TypeConversionFunctions.

- Move base36 arrays to PROGMEM in TypeConversionFunctions.cpp.

- Add deprecated atttribute to SHA1 and MD5 hashes.

- Remove _warningsEnabled in CryptoInterface since this has been replaced by the deprecated attribute.

- Prefix all TypeConversion getters with "get".

- Improve comments.

- Fix merge conflict.

libraries/ESP8266WiFiMesh/src/ResponseData.cpp

@@ -25,13 +25,13 @@
 #include "ResponseData.h"
 
 ResponseData::ResponseData(const String &message, const uint8_t recipientMac[6], uint64_t requestID, uint32_t creationTimeMs) : 
-  TimeTracker(creationTimeMs), _message(message), _requestID(requestID)
+  _timeTracker(creationTimeMs), _message(message), _requestID(requestID)
 {      
   storeRecipientMac(recipientMac);
 }
 
 ResponseData::ResponseData(const ResponseData &other) 
-  : TimeTracker(other), _message(other.getMessage()), _requestID(other.getRequestID())
+  : _timeTracker(other.getTimeTracker()), _message(other.getMessage()), _requestID(other.getRequestID())
 {
   storeRecipientMac(other.getRecipientMac());
 }
@@ -40,7 +40,7 @@ ResponseData & ResponseData::operator=(const ResponseData &other)
 {
   if(this != &other)
   {
-    TimeTracker::operator=(other);
+    _timeTracker = other.getTimeTracker();
     _message = other.getMessage();
     _requestID = other.getRequestID();
     storeRecipientMac(other.getRecipientMac());
@@ -51,21 +51,20 @@ ResponseData & ResponseData::operator=(const ResponseData &other)
 
 void ResponseData::storeRecipientMac(const uint8_t newRecipientMac[6])
 {
-  if(newRecipientMac != nullptr)
-  {
-    if(_recipientMac == nullptr)
-    {
-      _recipientMac = _recipientMacArray;
-    }
-    
-    for(int i = 0; i < 6; i++)
-    {
-      _recipientMac[i] = newRecipientMac[i];
-    }
-  }
-  else
+  if(newRecipientMac == nullptr)
   {
     _recipientMac = nullptr;
+    return;
+  }
+  
+  if(_recipientMac == nullptr)
+  {
+    _recipientMac = _recipientMacArray;
+  }
+  
+  for(int i = 0; i < 6; ++i)
+  {
+    _recipientMac[i] = newRecipientMac[i];
   }
 }
 
@@ -77,3 +76,5 @@ String ResponseData::getMessage() const { return _message; }
 
 void ResponseData::setRequestID(uint64_t requestID) { _requestID = requestID; }
 uint64_t ResponseData::getRequestID() const { return _requestID; }
+
+const TimeTracker &ResponseData::getTimeTracker() const { return _timeTracker; }