@alteriom/painlessmesh 1.6.1 → 1.7.2

package/examples/mqttTopologyTest/platformio.ini

@@ -0,0 +1,26 @@
+[platformio]
+src_dir = .
+
+[env]
+lib_deps =
+    bblanchon/ArduinoJson
+    arkhipenko/TaskScheduler
+    knolleary/PubSubClient
+
+[env:esp8266]
+platform = espressif8266
+board = nodemcuv2
+framework = arduino
+lib_extra_dirs = ../../
+lib_deps =
+    ${env.lib_deps}  ; Inherit common dependencies
+    esp32async/ESPAsyncTCP@^2.0.0  ; 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/namedMesh/namedMesh.ino

@@ -1,97 +1,97 @@
-//************************************************************
-// this is a simple example that uses the painlessMesh library
-//
-// This example shows how to build a mesh with named nodes using the plugin
-// system
-//
-//
-//************************************************************
-#include <cstdint>
-#include <map>
-#include "Arduino.h"
-#include "painlessMesh.h"
-#include "painlessmesh/plugin.hpp"
-
-#define MESH_PREFIX "whateverYouLike"
-#define MESH_PASSWORD "somethingSneaky"
-#define MESH_PORT 5555
-
-painlessMesh mesh;
-
-// NOTE: various ideas for improvement
-// - Send new names regularly and only send all names sometimes
-// - Keep track of the names the neighbour already knows (when we receive them)
-//   and only send unknown names/nodes
-// - Use some kind of bidirectoral map, so both get_name_from_id and
-//   get_id_from_name are fast
-
-// Send the names you know to your neighbours
-class NamePackage : public painlessmesh::plugin::NeighbourPackage {
- public:
-  std::map<TSTRING, uint32_t> names;
-
-  // Set an id for the package. Id can be any unique int not already in use. The
-  // mesh uses the numbers 1..12, so using a number larger than that
-  NamePackage() : painlessmesh::plugin::NeighbourPackage(21) {}
-
-  NamePackage(JsonObject jsonObj)
-      : painlessmesh::plugin::NeighbourPackage(jsonObj) {
-    for (JsonPair kv : jsonObj) {
-      names.insert(std::pair<TSTRING, uint32_t>(kv.key().c_str(), kv.value()));
-    }
-  }
-
-  JsonObject addTo(JsonObject&& jsonObj) const {
-    jsonObj = painlessmesh::plugin::NeighbourPackage::addTo(std::move(jsonObj));
-    for (auto&& kv : names) {
-      jsonObj[kv.first] = kv.second;
-    }
-    return jsonObj;
-  }
-};
-
-std::map<TSTRING, uint32_t> known_names;
-TSTRING get_name_from_id(uint32_t id) {
-  for (auto&& kv : known_names) {
-    if (kv.second == id) {
-      return kv.first;
-    }
-  }
-  return String(id);
-}
-
-uint32_t get_id_from_name(TSTRING name) {
-  auto it = known_names.find(name);
-  return (it != known_names.end()) ? it->second : 0;
-}
-
-void setup() {
-  Serial.begin(115200);
-  mesh.setDebugMsgTypes(ERROR | STARTUP);
-
-  mesh.init(MESH_PREFIX, MESH_PASSWORD, MESH_PORT);
-
-  auto sendPkg = std::make_shared<NamePackage>();
-  sendPkg->names = known_names;
-  // Every minute we send the names we know to our neighbours
-  mesh.addTask(TASK_MINUTE, TASK_FOREVER, [sendPkg, &mesh]() {
-    sendPkg->names = known_names;
-    mesh.sendPackage(sendPkg.get());
-  });
-
-  // When we receive a message of the correct type, then insert the names they
-  // know into our map of names
-  mesh.onPackage(sendPkg->type, [](painlessmesh::protocol::Variant& var) {
-    const auto& pkg = var.to<NamePackage>();
-    for (auto&& kv : pkg.names) {
-      known_names.insert(kv);
-    }
-
-    return false;
-  });
-}
-
-void loop() {
-  // it will run the user scheduler as well
-  mesh.update();
-}
+//************************************************************
+// this is a simple example that uses the painlessMesh library
+//
+// This example shows how to build a mesh with named nodes using the plugin
+// system
+//
+//
+//************************************************************
+#include <cstdint>
+#include <map>
+#include "Arduino.h"
+#include "painlessMesh.h"
+#include "painlessmesh/plugin.hpp"
+
+#define MESH_PREFIX "whateverYouLike"
+#define MESH_PASSWORD "somethingSneaky"
+#define MESH_PORT 5555
+
+painlessMesh mesh;
+
+// NOTE: various ideas for improvement
+// - Send new names regularly and only send all names sometimes
+// - Keep track of the names the neighbour already knows (when we receive them)
+//   and only send unknown names/nodes
+// - Use some kind of bidirectoral map, so both get_name_from_id and
+//   get_id_from_name are fast
+
+// Send the names you know to your neighbours
+class NamePackage : public painlessmesh::plugin::NeighbourPackage {
+ public:
+  std::map<TSTRING, uint32_t> names;
+
+  // Set an id for the package. Id can be any unique int not already in use. The
+  // mesh uses the numbers 1..12, so using a number larger than that
+  NamePackage() : painlessmesh::plugin::NeighbourPackage(21) {}
+
+  NamePackage(JsonObject jsonObj)
+      : painlessmesh::plugin::NeighbourPackage(jsonObj) {
+    for (JsonPair kv : jsonObj) {
+      names.insert(std::pair<TSTRING, uint32_t>(kv.key().c_str(), kv.value()));
+    }
+  }
+
+  JsonObject addTo(JsonObject&& jsonObj) const {
+    jsonObj = painlessmesh::plugin::NeighbourPackage::addTo(std::move(jsonObj));
+    for (auto&& kv : names) {
+      jsonObj[kv.first] = kv.second;
+    }
+    return jsonObj;
+  }
+};
+
+std::map<TSTRING, uint32_t> known_names;
+TSTRING get_name_from_id(uint32_t id) {
+  for (auto&& kv : known_names) {
+    if (kv.second == id) {
+      return kv.first;
+    }
+  }
+  return String(id);
+}
+
+uint32_t get_id_from_name(TSTRING name) {
+  auto it = known_names.find(name);
+  return (it != known_names.end()) ? it->second : 0;
+}
+
+void setup() {
+  Serial.begin(115200);
+  mesh.setDebugMsgTypes(ERROR | STARTUP);
+
+  mesh.init(MESH_PREFIX, MESH_PASSWORD, MESH_PORT);
+
+  auto sendPkg = std::make_shared<NamePackage>();
+  sendPkg->names = known_names;
+  // Every minute we send the names we know to our neighbours
+  mesh.addTask(TASK_MINUTE, TASK_FOREVER, [sendPkg, &mesh]() {
+    sendPkg->names = known_names;
+    mesh.sendPackage(sendPkg.get());
+  });
+
+  // When we receive a message of the correct type, then insert the names they
+  // know into our map of names
+  mesh.onPackage(sendPkg->type, [](painlessmesh::protocol::Variant& var) {
+    const auto& pkg = var.to<NamePackage>();
+    for (auto&& kv : pkg.names) {
+      known_names.insert(kv);
+    }
+
+    return false;
+  });
+}
+
+void loop() {
+  // it will run the user scheduler as well
+  mesh.update();
+}

package/examples/namedMesh/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/otaReceiver/otaReceiver.ino

@@ -1,79 +1,79 @@
-//************************************************************
-// this is a simple example that uses the painlessMesh library
-//
-// 1. sends a silly message to every node on the mesh at a random time between 1
-// and 5 seconds
-// 2. prints anything it receives to Serial.print
-// 3. has OTA support and can be updated remotely
-//
-//************************************************************
-#include "painlessMesh.h"
-
-#define MESH_PREFIX "whateverYouLike"
-#define MESH_PASSWORD "somethingSneaky"
-#define MESH_PORT 5555
-
-Scheduler userScheduler;  // to control your personal task
-painlessMesh mesh;
-
-// User stub
-void sendMessage();  // Prototype so PlatformIO doesn't complain
-
-Task taskSendMessage(TASK_SECOND * 1, TASK_FOREVER, &sendMessage);
-
-void sendMessage() {
-  String msg = "Hello from node ";
-  msg += mesh.getNodeId();
-  mesh.sendBroadcast(msg);
-  taskSendMessage.setInterval(random(TASK_SECOND * 1, TASK_SECOND * 5));
-}
-
-// Needed for painless library
-void receivedCallback(uint32_t from, String &msg) {
-  Serial.printf("startHere: Received from %u msg=%s\n", from, msg.c_str());
-}
-
-void newConnectionCallback(uint32_t nodeId) {
-  Serial.printf("--> startHere: New Connection, nodeId = %u\n", nodeId);
-}
-
-void changedConnectionCallback() { Serial.printf("Changed connections\n"); }
-
-void nodeTimeAdjustedCallback(int32_t offset) {
-  Serial.printf("Adjusted time %u. Offset = %d\n", mesh.getNodeTime(), offset);
-}
-
-void setup() {
-  Serial.begin(115200);
-
-  // mesh.setDebugMsgTypes( ERROR | MESH_STATUS | CONNECTION | SYNC |
-  // COMMUNICATION | GENERAL | MSG_TYPES | REMOTE ); // all types on
-  mesh.setDebugMsgTypes(
-      ERROR | STARTUP |
-      DEBUG);  // set before init() so that you can see startup messages
-
-  mesh.init(MESH_PREFIX, MESH_PASSWORD, &userScheduler, MESH_PORT);
-  mesh.onReceive(&receivedCallback);
-  mesh.onNewConnection(&newConnectionCallback);
-  mesh.onChangedConnections(&changedConnectionCallback);
-  mesh.onNodeTimeAdjusted(&nodeTimeAdjustedCallback);
-
-  // if you want your node to accept OTA firmware, simply include this line
-  // with whatever role you want your hardware to be. For instance, a
-  // mesh network may have a thermometer, rain detector, and bridge. Each of
-  // those may require different firmware, so different roles are preferrable.
-  //
-  // MAKE SURE YOUR UPLOADED OTA FIRMWARE INCLUDES OTA SUPPORT OR YOU WILL LOSE
-  // THE ABILITY TO UPLOAD MORE FIRMWARE OVER OTA. YOU ALSO WANT TO MAKE SURE
-  // THE ROLES ARE CORRECT
-  mesh.initOTAReceive("otareceiver");
-  mesh.setContainsRoot(true);
-
-  userScheduler.addTask(taskSendMessage);
-  taskSendMessage.enable();
-}
-
-void loop() {
-  // it will run the user scheduler as well
-  mesh.update();
-}
+//************************************************************
+// this is a simple example that uses the painlessMesh library
+//
+// 1. sends a silly message to every node on the mesh at a random time between 1
+// and 5 seconds
+// 2. prints anything it receives to Serial.print
+// 3. has OTA support and can be updated remotely
+//
+//************************************************************
+#include "painlessMesh.h"
+
+#define MESH_PREFIX "whateverYouLike"
+#define MESH_PASSWORD "somethingSneaky"
+#define MESH_PORT 5555
+
+Scheduler userScheduler;  // to control your personal task
+painlessMesh mesh;
+
+// User stub
+void sendMessage();  // Prototype so PlatformIO doesn't complain
+
+Task taskSendMessage(TASK_SECOND * 1, TASK_FOREVER, &sendMessage);
+
+void sendMessage() {
+  String msg = "Hello from node ";
+  msg += mesh.getNodeId();
+  mesh.sendBroadcast(msg);
+  taskSendMessage.setInterval(random(TASK_SECOND * 1, TASK_SECOND * 5));
+}
+
+// Needed for painless library
+void receivedCallback(uint32_t from, String &msg) {
+  Serial.printf("startHere: Received from %u msg=%s\n", from, msg.c_str());
+}
+
+void newConnectionCallback(uint32_t nodeId) {
+  Serial.printf("--> startHere: New Connection, nodeId = %u\n", nodeId);
+}
+
+void changedConnectionCallback() { Serial.printf("Changed connections\n"); }
+
+void nodeTimeAdjustedCallback(int32_t offset) {
+  Serial.printf("Adjusted time %u. Offset = %d\n", mesh.getNodeTime(), offset);
+}
+
+void setup() {
+  Serial.begin(115200);
+
+  // mesh.setDebugMsgTypes( ERROR | MESH_STATUS | CONNECTION | SYNC |
+  // COMMUNICATION | GENERAL | MSG_TYPES | REMOTE ); // all types on
+  mesh.setDebugMsgTypes(
+      ERROR | STARTUP |
+      DEBUG);  // set before init() so that you can see startup messages
+
+  mesh.init(MESH_PREFIX, MESH_PASSWORD, &userScheduler, MESH_PORT);
+  mesh.onReceive(&receivedCallback);
+  mesh.onNewConnection(&newConnectionCallback);
+  mesh.onChangedConnections(&changedConnectionCallback);
+  mesh.onNodeTimeAdjusted(&nodeTimeAdjustedCallback);
+
+  // if you want your node to accept OTA firmware, simply include this line
+  // with whatever role you want your hardware to be. For instance, a
+  // mesh network may have a thermometer, rain detector, and bridge. Each of
+  // those may require different firmware, so different roles are preferrable.
+  //
+  // MAKE SURE YOUR UPLOADED OTA FIRMWARE INCLUDES OTA SUPPORT OR YOU WILL LOSE
+  // THE ABILITY TO UPLOAD MORE FIRMWARE OVER OTA. YOU ALSO WANT TO MAKE SURE
+  // THE ROLES ARE CORRECT
+  mesh.initOTAReceive("otareceiver");
+  mesh.setContainsRoot(true);
+
+  userScheduler.addTask(taskSendMessage);
+  taskSendMessage.enable();
+}
+
+void loop() {
+  // it will run the user scheduler as well
+  mesh.update();
+}

package/examples/otaReceiver/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