- 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.
2025-07-24 19:42:27 +03:00 · 2020-05-15 20:33:08 +02:00
parent 3f5495bb3d
commit 40e1f02ffb
30 changed files with 3181 additions and 2263 deletions
--- a/libraries/ESP8266WiFiMesh/src/ConditionalPrinter.cpp
+++ b/libraries/ESP8266WiFiMesh/src/ConditionalPrinter.cpp
@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+
+#include "TypeConversionFunctions.h"
+#include "MeshBackendBase.h"
+#include "EspnowMeshBackend.h"
+
+namespace
+{
+  bool _staticVerboseMode = false;
+  bool _printWarnings = true;
+}
+
+void ConditionalPrinter::setVerboseModeState(const bool enabled) {_verboseMode = enabled;}
+bool ConditionalPrinter::verboseMode() const {return _verboseMode;}
+
+void ConditionalPrinter::verboseModePrint(const String &stringToPrint, const bool newline) const
+{
+  if(verboseMode())
+  {
+    if(newline)
+      Serial.println(stringToPrint);
+    else
+      Serial.print(stringToPrint);
+  }
+}
+
+void ConditionalPrinter::setStaticVerboseModeState(const bool enabled) {_staticVerboseMode = enabled;};
+bool ConditionalPrinter::staticVerboseMode() {return _staticVerboseMode;}
+
+void ConditionalPrinter::staticVerboseModePrint(const String &stringToPrint, const bool newline)
+{
+  if(staticVerboseMode())
+  {
+    if(newline)
+      Serial.println(stringToPrint);
+    else
+      Serial.print(stringToPrint);
+  }
+}
+
+void ConditionalPrinter::setPrintWarnings(const bool printEnabled) {_printWarnings = printEnabled;}
+bool ConditionalPrinter::printWarnings() {return _printWarnings;}
+
+void ConditionalPrinter::warningPrint(const String &stringToPrint, const bool newline)
+{
+  if(printWarnings())
+  {
+    if(newline)
+      Serial.println(stringToPrint);
+    else
+      Serial.print(stringToPrint);
+  }
+}