- Split most of the EspnowMeshBackend code into utility files and the new ConditionalPrinter, EspnowDatabase, EspnowConnectionManager, EspnowTransmitter and EspnowEncryptionBroker classes.

- Improve mutex handling.

- Move verifyEncryptionRequestHmac function from JsonTranslator to EspnowEncryptionBroker.

- Remove UtilityMethods.cpp.

Author: aerlon

libraries/ESP8266WiFiMesh/examples/HelloEspnow/HelloEspnow.ino

@@ -2,6 +2,7 @@
 
 #include <ESP8266WiFi.h>
 #include <EspnowMeshBackend.h>
+#include <TcpIpMeshBackend.h>
 #include <TypeConversionFunctions.h>
 #include <assert.h>
 

libraries/ESP8266WiFiMesh/examples/HelloTcpIp/HelloTcpIp.ino

@@ -2,6 +2,7 @@
 
 #include <ESP8266WiFi.h>
 #include <TcpIpMeshBackend.h>
+#include <EspnowMeshBackend.h>
 #include <TypeConversionFunctions.h>
 #include <assert.h>
 

libraries/ESP8266WiFiMesh/src/UtilityMethods.cpp renamed to libraries/ESP8266WiFiMesh/src/ConditionalPrinter.cpp

@@ -1,6 +1,5 @@
 /*
- * UtilityMethods
- * Copyright (C) 2018 Anders Löfgren
+ * Copyright (C) 2020 Anders Löfgren
  *
  * License (MIT license):
  *
@@ -27,24 +26,16 @@
 #include "MeshBackendBase.h"
 #include "EspnowMeshBackend.h"
 
-void MeshBackendBase::setVerboseModeState(const bool enabled) {_verboseMode = enabled;}
-bool MeshBackendBase::verboseMode() const {return _verboseMode;}
-
-void MeshBackendBase::verboseModePrint(const String &stringToPrint, const bool newline) const
+namespace
 {
-  if(verboseMode())
-  {
-    if(newline)
-      Serial.println(stringToPrint);
-    else
-      Serial.print(stringToPrint);
-  }
+  bool _staticVerboseMode = false;
+  bool _printWarnings = true;
 }
 
-void EspnowMeshBackend::setVerboseModeState(const bool enabled) {MeshBackendBase::setVerboseModeState(enabled); _staticVerboseMode = enabled;}
-bool EspnowMeshBackend::verboseMode() const {return staticVerboseMode();}
+void ConditionalPrinter::setVerboseModeState(const bool enabled) {_verboseMode = enabled;}
+bool ConditionalPrinter::verboseMode() const {return _verboseMode;}
 
-void EspnowMeshBackend::verboseModePrint(const String &stringToPrint, const bool newline) const
+void ConditionalPrinter::verboseModePrint(const String &stringToPrint, const bool newline) const
 {
   if(verboseMode())
   {
@@ -55,9 +46,10 @@ void EspnowMeshBackend::verboseModePrint(const String &stringToPrint, const bool
   }
 }
 
-bool EspnowMeshBackend::staticVerboseMode() {return _staticVerboseMode;}
+void ConditionalPrinter::setStaticVerboseModeState(const bool enabled) {_staticVerboseMode = enabled;};
+bool ConditionalPrinter::staticVerboseMode() {return _staticVerboseMode;}
 
-void EspnowMeshBackend::staticVerboseModePrint(const String &stringToPrint, const bool newline)
+void ConditionalPrinter::staticVerboseModePrint(const String &stringToPrint, const bool newline)
 {
   if(staticVerboseMode())
   {
@@ -68,10 +60,10 @@ void EspnowMeshBackend::staticVerboseModePrint(const String &stringToPrint, cons
   }
 }
 
-void MeshBackendBase::setPrintWarnings(const bool printEnabled) {_printWarnings = printEnabled;}
-bool MeshBackendBase::printWarnings() {return _printWarnings;}
+void ConditionalPrinter::setPrintWarnings(const bool printEnabled) {_printWarnings = printEnabled;}
+bool ConditionalPrinter::printWarnings() {return _printWarnings;}
 
-void MeshBackendBase::warningPrint(const String &stringToPrint, const bool newline)
+void ConditionalPrinter::warningPrint(const String &stringToPrint, const bool newline)
 {
   if(printWarnings())
   {

libraries/ESP8266WiFiMesh/src/ConditionalPrinter.h

@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2020 Anders Löfgren
+ *
+ * License (MIT license):
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+ 
+#ifndef __CONDITIONALPRINTER_H__
+#define __CONDITIONALPRINTER_H__
+
+class ConditionalPrinter
+{
+
+public:
+
+  /**
+   * Set whether the normal events occurring in the library will be printed to Serial or not.
+   * 
+   * @param enabled If true, library Serial prints are activated.
+   */
+  void setVerboseModeState(const bool enabled);
+  bool verboseMode() const;
+  
+  /**
+   * Only print stringToPrint if verboseMode() returns true.
+   * 
+   * @param stringToPrint String to print.
+   * @param newline If true, will end the print with a newline. True by default.
+   */
+  void verboseModePrint(const String &stringToPrint, const bool newline = true) const;
+
+  /**
+   * Same as verboseMode(), but used for printing from static functions.
+   * 
+   * @param enabled If true, the normal events occurring in the library will be printed to Serial.
+   */
+   static void setStaticVerboseModeState(const bool enabled);
+   static bool staticVerboseMode();
+  
+  /**
+   * Only print stringToPrint if staticVerboseMode() returns true.
+   * 
+   * @param stringToPrint String to print.
+   * @param newline If true, will end the print with a newline. True by default.
+   */
+  static void staticVerboseModePrint(const String &stringToPrint, const bool newline = true);
+  
+  /**
+   * Set whether the warnings occurring in the library will be printed to Serial or not. On by default.
+   * 
+   * @param printEnabled If true, warning Serial prints from the library are activated.
+   */
+  static void setPrintWarnings(const bool printEnabled);
+  static bool printWarnings();
+
+  /**
+   * Only print stringToPrint if printWarnings() returns true.
+   * 
+   * @param stringToPrint String to print.
+   * @param newline If true, will end the print with a newline. True by default.
+   */
+  static void warningPrint(const String &stringToPrint, const bool newline = true);
+  
+private:
+
+  bool _verboseMode = false;
+
+};
+
+#endif