@alteriom/painlessmesh 1.6.1 → 1.7.2

package/examples/logClient/logClient.ino

@@ -1,109 +1,109 @@
-//************************************************************
-// this is a simple example that uses the painlessMesh library to 
-// setup a node that logs to a central logging node
-// The logServer example shows how to configure the central logging nodes
-//************************************************************
-#include "painlessMesh.h"
-
-#define   MESH_PREFIX     "whateverYouLike"
-#define   MESH_PASSWORD   "somethingSneaky"
-#define   MESH_PORT       5555
-
-Scheduler     userScheduler; // to control your personal task
-painlessMesh  mesh;
-
-// Prototype
-void receivedCallback( uint32_t from, String &msg );
-
-size_t logServerId = 0;
-
-// Send message to the logServer every 10 seconds 
-Task myLoggingTask(10000, TASK_FOREVER, []() {
-#if ARDUINOJSON_VERSION_MAJOR==7
-        JsonDocument jsonBuffer;
-        JsonObject msg = jsonBuffer.to<JsonObject>();
-#elif ARDUINOJSON_VERSION_MAJOR==6
-        DynamicJsonDocument jsonBuffer(1024);
-        JsonObject msg = jsonBuffer.to<JsonObject>();
-#else
-        DynamicJsonBuffer jsonBuffer;
-        JsonObject& msg = jsonBuffer.createObject();
-#endif
-    msg["topic"] = "sensor";
-    msg["value"] = random(0, 180);
-
-    String str;
-#if ARDUINOJSON_VERSION_MAJOR>=6
-    serializeJson(msg, str);
-#else
-    msg.printTo(str);
-#endif
-    if (logServerId == 0) // If we don't know the logServer yet
-        mesh.sendBroadcast(str);
-    else
-        mesh.sendSingle(logServerId, str);
-
-    // log to serial
-#if ARDUINOJSON_VERSION_MAJOR>=6
-    serializeJson(msg, Serial);
-#else
-    msg.printTo(Serial);
-#endif
-    Serial.printf("\n");
-});
-
-void setup() {
-  Serial.begin(115200);
-    
-  mesh.setDebugMsgTypes( ERROR | STARTUP | CONNECTION );  // set before init() so that you can see startup messages
-
-  mesh.init( MESH_PREFIX, MESH_PASSWORD, &userScheduler, MESH_PORT, WIFI_AP_STA, 6 );
-  mesh.onReceive(&receivedCallback);
-
-  // Add the task to the your scheduler
-  userScheduler.addTask(myLoggingTask);
-  myLoggingTask.enable();
-}
-
-void loop() {
-  // it will run the user scheduler as well
-  mesh.update();
-}
-
-void receivedCallback( uint32_t from, String &msg ) {
-  Serial.printf("logClient: Received from %u msg=%s\n", from, msg.c_str());
-
-  // Saving logServer
-#if ARDUINOJSON_VERSION_MAJOR==7
-  JsonDocument jsonBuffer;
-  DeserializationError error = deserializeJson(jsonBuffer, msg);
-  if (error) {
-    Serial.printf("DeserializationError\n");
-    return;
-  }
-  JsonObject root = jsonBuffer.as<JsonObject>();
-#elif ARDUINOJSON_VERSION_MAJOR==6
-  DynamicJsonDocument jsonBuffer(1024 + msg.length());
-  DeserializationError error = deserializeJson(jsonBuffer, msg);
-  if (error) {
-    Serial.printf("DeserializationError\n");
-    return;
-  }
-  JsonObject root = jsonBuffer.as<JsonObject>();
-#else
-  DynamicJsonBuffer jsonBuffer;
-  JsonObject& root = jsonBuffer.parseObject(msg);
-#endif
-#if ARDUINOJSON_VERSION_MAJOR < 7
-  if (root.containsKey("topic")) {
-#else
-  if (root["topic"].is<String>()) {
-#endif
-      if (String("logServer").equals(root["topic"].as<String>())) {
-          // check for on: true or false
-          logServerId = root["nodeId"];
-          Serial.printf("logServer detected!!!\n");
-      }
-      Serial.printf("Handled from %u msg=%s\n", from, msg.c_str());
-  }
-}
+//************************************************************
+// this is a simple example that uses the painlessMesh library to 
+// setup a node that logs to a central logging node
+// The logServer example shows how to configure the central logging nodes
+//************************************************************
+#include "painlessMesh.h"
+
+#define   MESH_PREFIX     "whateverYouLike"
+#define   MESH_PASSWORD   "somethingSneaky"
+#define   MESH_PORT       5555
+
+Scheduler     userScheduler; // to control your personal task
+painlessMesh  mesh;
+
+// Prototype
+void receivedCallback( uint32_t from, String &msg );
+
+size_t logServerId = 0;
+
+// Send message to the logServer every 10 seconds 
+Task myLoggingTask(10000, TASK_FOREVER, []() {
+#if ARDUINOJSON_VERSION_MAJOR==7
+        JsonDocument jsonBuffer;
+        JsonObject msg = jsonBuffer.to<JsonObject>();
+#elif ARDUINOJSON_VERSION_MAJOR==6
+        DynamicJsonDocument jsonBuffer(1024);
+        JsonObject msg = jsonBuffer.to<JsonObject>();
+#else
+        DynamicJsonBuffer jsonBuffer;
+        JsonObject& msg = jsonBuffer.createObject();
+#endif
+    msg["topic"] = "sensor";
+    msg["value"] = random(0, 180);
+
+    String str;
+#if ARDUINOJSON_VERSION_MAJOR>=6
+    serializeJson(msg, str);
+#else
+    msg.printTo(str);
+#endif
+    if (logServerId == 0) // If we don't know the logServer yet
+        mesh.sendBroadcast(str);
+    else
+        mesh.sendSingle(logServerId, str);
+
+    // log to serial
+#if ARDUINOJSON_VERSION_MAJOR>=6
+    serializeJson(msg, Serial);
+#else
+    msg.printTo(Serial);
+#endif
+    Serial.printf("\n");
+});
+
+void setup() {
+  Serial.begin(115200);
+    
+  mesh.setDebugMsgTypes( ERROR | STARTUP | CONNECTION );  // set before init() so that you can see startup messages
+
+  mesh.init( MESH_PREFIX, MESH_PASSWORD, &userScheduler, MESH_PORT, WIFI_AP_STA, 6 );
+  mesh.onReceive(&receivedCallback);
+
+  // Add the task to the your scheduler
+  userScheduler.addTask(myLoggingTask);
+  myLoggingTask.enable();
+}
+
+void loop() {
+  // it will run the user scheduler as well
+  mesh.update();
+}
+
+void receivedCallback( uint32_t from, String &msg ) {
+  Serial.printf("logClient: Received from %u msg=%s\n", from, msg.c_str());
+
+  // Saving logServer
+#if ARDUINOJSON_VERSION_MAJOR==7
+  JsonDocument jsonBuffer;
+  DeserializationError error = deserializeJson(jsonBuffer, msg);
+  if (error) {
+    Serial.printf("DeserializationError\n");
+    return;
+  }
+  JsonObject root = jsonBuffer.as<JsonObject>();
+#elif ARDUINOJSON_VERSION_MAJOR==6
+  DynamicJsonDocument jsonBuffer(1024 + msg.length());
+  DeserializationError error = deserializeJson(jsonBuffer, msg);
+  if (error) {
+    Serial.printf("DeserializationError\n");
+    return;
+  }
+  JsonObject root = jsonBuffer.as<JsonObject>();
+#else
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& root = jsonBuffer.parseObject(msg);
+#endif
+#if ARDUINOJSON_VERSION_MAJOR < 7
+  if (root.containsKey("topic")) {
+#else
+  if (root["topic"].is<String>()) {
+#endif
+      if (String("logServer").equals(root["topic"].as<String>())) {
+          // check for on: true or false
+          logServerId = root["nodeId"];
+          Serial.printf("logServer detected!!!\n");
+      }
+      Serial.printf("Handled from %u msg=%s\n", from, msg.c_str());
+  }
+}

package/examples/logClient/platformio.ini

@@ -1,25 +1,25 @@
-[platformio]
-src_dir = .
-
-[env]
-lib_deps =
-    bblanchon/ArduinoJson
-    arkhipenko/TaskScheduler
-
-[env:esp8266]
-platform = espressif8266
-board = nodemcuv2
-framework = arduino
-lib_extra_dirs = ../../
-lib_deps =
-    ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/ESPAsyncTCP  ; Only for ESP8266
-
-[env:esp32]
-platform = espressif32
-board = esp32dev
-framework = arduino
-lib_extra_dirs = ../../
-lib_deps =
-    ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/AsyncTCP
+[platformio]
+src_dir = .
+
+[env]
+lib_deps =
+    bblanchon/ArduinoJson
+    arkhipenko/TaskScheduler
+
+[env:esp8266]
+platform = espressif8266
+board = nodemcuv2
+framework = arduino
+lib_extra_dirs = ../../
+lib_deps =
+    ${env.lib_deps}  ; Inherit common dependencies
+    esp32async/ESPAsyncTCP  ; Only for ESP8266
+
+[env:esp32]
+platform = espressif32
+board = esp32dev
+framework = arduino
+lib_extra_dirs = ../../
+lib_deps =
+    ${env.lib_deps}  ; Inherit common dependencies
+    esp32async/AsyncTCP

package/examples/logServer/logServer.ino

@@ -1,81 +1,81 @@
-//************************************************************
-// this is a simple example that uses the painlessMesh library to 
-// setup a single node (this node) as a logging node
-// The logClient example shows how to configure the other nodes
-// to log to this server
-//************************************************************
-#include "painlessMesh.h"
-
-#define   MESH_PREFIX     "whateverYouLike"
-#define   MESH_PASSWORD   "somethingSneaky"
-#define   MESH_PORT       5555
-
-Scheduler     userScheduler; // to control your personal task
-painlessMesh  mesh;
-// Prototype
-void receivedCallback( uint32_t from, String &msg );
-
-
-// Send my ID every 10 seconds to inform others
-Task logServerTask(10000, TASK_FOREVER, []() {
-#if ARDUINOJSON_VERSION_MAJOR==7
-        JsonDocument jsonBuffer;
-        JsonObject msg = jsonBuffer.to<JsonObject>();
-#elif ARDUINOJSON_VERSION_MAJOR==6
-        DynamicJsonDocument jsonBuffer(1024);
-        JsonObject msg = jsonBuffer.to<JsonObject>();
-#else
-        DynamicJsonBuffer jsonBuffer;
-        JsonObject& msg = jsonBuffer.createObject();
-#endif
-    msg["topic"] = "logServer";
-    msg["nodeId"] = mesh.getNodeId();
-
-    String str;
-#if ARDUINOJSON_VERSION_MAJOR>=6
-    serializeJson(msg, str);
-#else
-    msg.printTo(str);
-#endif
-    mesh.sendBroadcast(str);
-
-    // log to serial
-#if ARDUINOJSON_VERSION_MAJOR>=6
-    serializeJson(msg, Serial);
-#else
-    msg.printTo(Serial);
-#endif
-    Serial.printf("\n");
-});
-
-void setup() {
-  Serial.begin(115200);
-    
-  //mesh.setDebugMsgTypes( ERROR | MESH_STATUS | CONNECTION | SYNC | COMMUNICATION | GENERAL | MSG_TYPES | REMOTE | DEBUG ); // all types on
-  //mesh.setDebugMsgTypes( ERROR | CONNECTION | SYNC | S_TIME );  // set before init() so that you can see startup messages
-  mesh.setDebugMsgTypes( ERROR | CONNECTION | S_TIME );  // set before init() so that you can see startup messages
-
-  mesh.init( MESH_PREFIX, MESH_PASSWORD, &userScheduler, MESH_PORT, WIFI_AP_STA, 6 );
-  mesh.onReceive(&receivedCallback);
-
-  mesh.onNewConnection([](size_t nodeId) {
-    Serial.printf("New Connection %u\n", nodeId);
-  });
-
-  mesh.onDroppedConnection([](size_t nodeId) {
-    Serial.printf("Dropped Connection %u\n", nodeId);
-  });
-
-  // Add the task to the your scheduler
-  userScheduler.addTask(logServerTask);
-  logServerTask.enable();
-}
-
-void loop() {
-  // it will run the user scheduler as well
-  mesh.update();
-}
-
-void receivedCallback( uint32_t from, String &msg ) {
-  Serial.printf("logServer: Received from %u msg=%s\n", from, msg.c_str());
-}
+//************************************************************
+// this is a simple example that uses the painlessMesh library to 
+// setup a single node (this node) as a logging node
+// The logClient example shows how to configure the other nodes
+// to log to this server
+//************************************************************
+#include "painlessMesh.h"
+
+#define   MESH_PREFIX     "whateverYouLike"
+#define   MESH_PASSWORD   "somethingSneaky"
+#define   MESH_PORT       5555
+
+Scheduler     userScheduler; // to control your personal task
+painlessMesh  mesh;
+// Prototype
+void receivedCallback( uint32_t from, String &msg );
+
+
+// Send my ID every 10 seconds to inform others
+Task logServerTask(10000, TASK_FOREVER, []() {
+#if ARDUINOJSON_VERSION_MAJOR==7
+        JsonDocument jsonBuffer;
+        JsonObject msg = jsonBuffer.to<JsonObject>();
+#elif ARDUINOJSON_VERSION_MAJOR==6
+        DynamicJsonDocument jsonBuffer(1024);
+        JsonObject msg = jsonBuffer.to<JsonObject>();
+#else
+        DynamicJsonBuffer jsonBuffer;
+        JsonObject& msg = jsonBuffer.createObject();
+#endif
+    msg["topic"] = "logServer";
+    msg["nodeId"] = mesh.getNodeId();
+
+    String str;
+#if ARDUINOJSON_VERSION_MAJOR>=6
+    serializeJson(msg, str);
+#else
+    msg.printTo(str);
+#endif
+    mesh.sendBroadcast(str);
+
+    // log to serial
+#if ARDUINOJSON_VERSION_MAJOR>=6
+    serializeJson(msg, Serial);
+#else
+    msg.printTo(Serial);
+#endif
+    Serial.printf("\n");
+});
+
+void setup() {
+  Serial.begin(115200);
+    
+  //mesh.setDebugMsgTypes( ERROR | MESH_STATUS | CONNECTION | SYNC | COMMUNICATION | GENERAL | MSG_TYPES | REMOTE | DEBUG ); // all types on
+  //mesh.setDebugMsgTypes( ERROR | CONNECTION | SYNC | S_TIME );  // set before init() so that you can see startup messages
+  mesh.setDebugMsgTypes( ERROR | CONNECTION | S_TIME );  // set before init() so that you can see startup messages
+
+  mesh.init( MESH_PREFIX, MESH_PASSWORD, &userScheduler, MESH_PORT, WIFI_AP_STA, 6 );
+  mesh.onReceive(&receivedCallback);
+
+  mesh.onNewConnection([](size_t nodeId) {
+    Serial.printf("New Connection %u\n", nodeId);
+  });
+
+  mesh.onDroppedConnection([](size_t nodeId) {
+    Serial.printf("Dropped Connection %u\n", nodeId);
+  });
+
+  // Add the task to the your scheduler
+  userScheduler.addTask(logServerTask);
+  logServerTask.enable();
+}
+
+void loop() {
+  // it will run the user scheduler as well
+  mesh.update();
+}
+
+void receivedCallback( uint32_t from, String &msg ) {
+  Serial.printf("logServer: Received from %u msg=%s\n", from, msg.c_str());
+}

package/examples/logServer/platformio.ini

@@ -1,25 +1,25 @@
-[platformio]
-src_dir = .
-
-[env]
-lib_deps =
-    bblanchon/ArduinoJson
-    arkhipenko/TaskScheduler
-
-[env:esp8266]
-platform = espressif8266
-board = nodemcuv2
-framework = arduino
-lib_extra_dirs = ../../
-lib_deps =
-    ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/ESPAsyncTCP  ; Only for ESP8266
-
-[env:esp32]
-platform = espressif32
-board = esp32dev
-framework = arduino
-lib_extra_dirs = ../../
-lib_deps =
-    ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/AsyncTCP
+[platformio]
+src_dir = .
+
+[env]
+lib_deps =
+    bblanchon/ArduinoJson
+    arkhipenko/TaskScheduler
+
+[env:esp8266]
+platform = espressif8266
+board = nodemcuv2
+framework = arduino
+lib_extra_dirs = ../../
+lib_deps =
+    ${env.lib_deps}  ; Inherit common dependencies
+    esp32async/ESPAsyncTCP  ; Only for ESP8266
+
+[env:esp32]
+platform = espressif32
+board = esp32dev
+framework = arduino
+lib_extra_dirs = ../../
+lib_deps =
+    ${env.lib_deps}  ; Inherit common dependencies
+    esp32async/AsyncTCP