- 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/MessageData.h

@@ -28,7 +28,7 @@
 #include "TimeTracker.h"
 #include <Arduino.h>
 
-class MessageData : public TimeTracker {
+class MessageData {
 
 public:
 
@@ -43,9 +43,11 @@ public:
   uint8_t getTransmissionsExpected();
   uint8_t getTransmissionsRemaining();
   String getTotalMessage();
+  const TimeTracker &getTimeTracker() const;
 
 private:
 
+  TimeTracker _timeTracker;
   uint8_t _transmissionsReceived = 0;
   uint8_t _transmissionsExpected;
   String _totalMessage;