@alteriom/painlessmesh 1.7.7 → 1.7.9

package/examples/bridge/bridge.ino

@@ -26,8 +26,8 @@ void setup() {
       ERROR | STARTUP |
       CONNECTION);  // set before init() so that you can see startup messages
 
-  // Channel set to 6. Make sure to use the same channel for your mesh and for
-  // you other network (STATION_SSID)
+  // Initialize mesh network in AP+STA mode on channel 1
+  // stationManual() will automatically handle channel switching if needed
   mesh.init(MESH_PREFIX, MESH_PASSWORD, MESH_PORT, WIFI_AP_STA, 1);
   // Setup over the air update support
   mesh.initOTAReceive("bridge");

package/examples/bridge/enhanced_mqtt_bridge.hpp

@@ -29,7 +29,7 @@
 #include <Arduino.h>
 #include <painlessMesh.h>
 #include <PubSubClient.h>
-#include "alteriom/alteriom_sensor_package.hpp"
+#include "alteriom_sensor_package.hpp"
 
 using namespace alteriom;
 

package/examples/bridge/mqtt_command_bridge.hpp

@@ -3,8 +3,8 @@
 
 #include "painlessMesh.h"
 #include <PubSubClient.h>
-#include "examples/alteriom/alteriom_sensor_package.hpp"
-#include "examples/bridge/mesh_topology_reporter.hpp"
+#include "alteriom_sensor_package.hpp"
+#include "mesh_topology_reporter.hpp"
 
 using namespace alteriom;
 

package/examples/bridge/platformio.ini

@@ -5,6 +5,7 @@ src_dir = .
 lib_deps =
     bblanchon/ArduinoJson
     arkhipenko/TaskScheduler
+    knolleary/PubSubClient
 
 lib_ldf_mode = deep+
 [env:esp8266]
@@ -14,7 +15,7 @@ framework = arduino
 lib_extra_dirs = ../../
 lib_deps =
     ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/ESPAsyncTCP  ; Only for ESP8266
+    esp32async/ESPAsyncTCP@^2.0.0  ; Only for ESP8266
 
 [env:esp32]
 platform = espressif32

package/examples/echoNode/platformio.ini

@@ -14,7 +14,7 @@ framework = arduino
 lib_extra_dirs = ../../
 lib_deps =
     ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/ESPAsyncTCP  ; Only for ESP8266
+    esp32async/ESPAsyncTCP@^2.0.0  ; Only for ESP8266
 
 [env:esp32]
 platform = espressif32

package/examples/logClient/platformio.ini

@@ -14,7 +14,7 @@ framework = arduino
 lib_extra_dirs = ../../
 lib_deps =
     ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/ESPAsyncTCP  ; Only for ESP8266
+    esp32async/ESPAsyncTCP@^2.0.0  ; Only for ESP8266
 
 [env:esp32]
 platform = espressif32

package/examples/logServer/platformio.ini

@@ -14,7 +14,7 @@ framework = arduino
 lib_extra_dirs = ../../
 lib_deps =
     ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/ESPAsyncTCP  ; Only for ESP8266
+    esp32async/ESPAsyncTCP@^2.0.0  ; Only for ESP8266
 
 [env:esp32]
 platform = espressif32

package/examples/mqttStatusBridge/platformio.ini

@@ -15,7 +15,7 @@ framework = arduino
 lib_extra_dirs = ../../  ; Load the local copy of painlessmesh
 lib_deps =
     ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/ESPAsyncTCP  ; Only for ESP8266
+    esp32async/ESPAsyncTCP@^2.0.0  ; Only for ESP8266
 
 [env:esp32]
 platform = espressif32

package/examples/namedMesh/platformio.ini

@@ -14,7 +14,7 @@ framework = arduino
 lib_extra_dirs = ../../
 lib_deps =
     ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/ESPAsyncTCP  ; Only for ESP8266
+    esp32async/ESPAsyncTCP@^2.0.0  ; Only for ESP8266
 
 [env:esp32]
 platform = espressif32

package/examples/otaReceiver/platformio.ini

@@ -14,7 +14,7 @@ framework = arduino
 lib_extra_dirs = ../../
 lib_deps =
     ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/ESPAsyncTCP  ; Only for ESP8266
+    esp32async/ESPAsyncTCP@^2.0.0  ; Only for ESP8266
 
 [env:esp32]
 platform = espressif32

package/examples/startHere/platformio.ini

@@ -14,7 +14,7 @@ framework = arduino
 lib_extra_dirs = ../../  ; Load the local copy of painlessmesh. For your own example add painlessmesh to the lib_deps
 lib_deps =
     ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/ESPAsyncTCP  ; Only for ESP8266
+    esp32async/ESPAsyncTCP@^2.0.0  ; Only for ESP8266
 
 [env:esp32]
 platform = espressif32

package/examples/webServer/platformio.ini

@@ -15,7 +15,7 @@ framework = arduino
 lib_extra_dirs = ../../
 lib_deps =
     ${env.lib_deps}  ; Inherit common dependencies
-    esp32async/ESPAsyncTCP  ; Only for ESP8266
+    esp32async/ESPAsyncTCP@^2.0.0  ; Only for ESP8266
 
 [env:esp32]
 platform = espressif32

package/library.json

@@ -1,55 +1,95 @@
 {
-    "name": "AlteriomPainlessMesh",
-    "keywords": "ethernet, m2m, iot, mesh, alteriom, sensor, esp32, esp8266, json, time-sync, wireless, communication",
-    "description": "painlessMesh is a user-friendly library for creating mesh networks with ESP8266 and ESP32 devices. This Alteriom fork includes additional packages for sensor data (SensorPackage), device commands (CommandPackage), and status monitoring (StatusPackage). It handles routing and network management automatically, so you can focus on your application. The library uses JSON-based messaging and syncs time across all nodes, making it ideal for coordinated behaviour like synchronized light displays or sensor networks reporting to a central node.",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/Alteriom/painlessMesh"
-    },
-    "version": "1.7.7",
-    "frameworks": ["arduino"],
-    "platforms": ["espressif8266", "espressif32"],
-    "srcDir": "src",
-    "includeDir": "src",
-    "dependencies": [
-        { "owner": "esp32async", "name": "AsyncTCP", "version": "^3.4.7",  "platforms" : ["espressif32"] },
-        { "owner": "esp32async", "name": "ESPAsyncTCP", "version": "^2.0.0",  "platforms" : ["espressif8266"] },
-        { "owner": "bblanchon", "name": "ArduinoJson", "version": "^7.4.2" },
-        { "owner": "arkhipenko", "name": "TaskScheduler", "version": "^4.0.0" }
-    ],
-    "authors": [
-        { "name": "Scotty Franzyshen" }, 
-        { 
-            "name": "Coopdis",
-            "url": "https://github.com/Coopdis"
-        }, 
-        { "name": "Edwin van Leeuwen" },
-        { "name": "Germán Martín" },
-        { "name": "Maximilian Schwarz" },
-        { "name": "Doanh Doanh" },
-        { 
-            "name": "Alteriom",
-            "url": "https://github.com/Alteriom",
-            "maintainer": true
-        }
-    ],
-    "license": "LGPL-3.0",
-    "homepage": "https://github.com/Alteriom/painlessMesh",
-    "headers": ["painlessMesh.h", "AlteriomPainlessMesh.h"],
-    "examples": [
-        "examples/alteriom/alteriom.ino",
-        "examples/alteriom/alteriom_sensor_node.ino", 
-        "examples/alteriom/improved_sensor_node.ino",
-        "examples/basic/basic.ino",
-        "examples/bridge/bridge.ino",
-        "examples/echoNode/echoNode.ino",
-        "examples/logClient/logClient.ino",
-        "examples/logServer/logServer.ino",
-        "examples/mqttBridge/mqttBridge.ino",
-        "examples/namedMesh/namedMesh.ino",
-        "examples/otaReceiver/otaReceiver.ino",
-        "examples/otaSender/otaSender.ino",
-        "examples/startHere/startHere.ino",
-        "examples/webServer/webServer.ino"
-    ]
+  "name": "AlteriomPainlessMesh",
+  "keywords": "ethernet, m2m, iot, mesh, alteriom, sensor, esp32, esp8266, json, time-sync, wireless, communication",
+  "description": "painlessMesh is a user-friendly library for creating mesh networks with ESP8266 and ESP32 devices. This Alteriom fork includes additional packages for sensor data (SensorPackage), device commands (CommandPackage), and status monitoring (StatusPackage). It handles routing and network management automatically, so you can focus on your application. The library uses JSON-based messaging and syncs time across all nodes, making it ideal for coordinated behaviour like synchronized light displays or sensor networks reporting to a central node.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Alteriom/painlessMesh"
+  },
+  "version": "1.7.9",
+  "frameworks": [
+    "arduino"
+  ],
+  "platforms": [
+    "espressif8266",
+    "espressif32"
+  ],
+  "srcDir": "src",
+  "includeDir": "src",
+  "dependencies": [
+    {
+      "owner": "esp32async",
+      "name": "AsyncTCP",
+      "version": "^3.4.7",
+      "platforms": [
+        "espressif32"
+      ]
+    },
+    {
+      "owner": "esp32async",
+      "name": "ESPAsyncTCP",
+      "version": "^2.0.0",
+      "platforms": [
+        "espressif8266"
+      ]
+    },
+    {
+      "owner": "bblanchon",
+      "name": "ArduinoJson",
+      "version": "^7.4.2"
+    },
+    {
+      "owner": "arkhipenko",
+      "name": "TaskScheduler",
+      "version": "^4.0.0"
+    }
+  ],
+  "authors": [
+    {
+      "name": "Scotty Franzyshen"
+    },
+    {
+      "name": "Coopdis",
+      "url": "https://github.com/Coopdis"
+    },
+    {
+      "name": "Edwin van Leeuwen"
+    },
+    {
+      "name": "Germán Martín"
+    },
+    {
+      "name": "Maximilian Schwarz"
+    },
+    {
+      "name": "Doanh Doanh"
+    },
+    {
+      "name": "Alteriom",
+      "url": "https://github.com/Alteriom",
+      "maintainer": true
+    }
+  ],
+  "license": "LGPL-3.0",
+  "homepage": "https://github.com/Alteriom/painlessMesh",
+  "headers": [
+    "painlessMesh.h",
+    "AlteriomPainlessMesh.h"
+  ],
+  "examples": [
+    "examples/alteriom/alteriom.ino",
+    "examples/alteriom/alteriom_sensor_node.ino",
+    "examples/alteriom/improved_sensor_node.ino",
+    "examples/basic/basic.ino",
+    "examples/bridge/bridge.ino",
+    "examples/echoNode/echoNode.ino",
+    "examples/logClient/logClient.ino",
+    "examples/logServer/logServer.ino",
+    "examples/mqttBridge/mqttBridge.ino",
+    "examples/namedMesh/namedMesh.ino",
+    "examples/otaReceiver/otaReceiver.ino",
+    "examples/otaSender/otaSender.ino",
+    "examples/startHere/startHere.ino",
+    "examples/webServer/webServer.ino"
+  ]
 }

package/library.properties

@@ -1,5 +1,5 @@
 name=AlteriomPainlessMesh
-version=1.7.7
+version=1.7.9
 author=Coopdis,Scotty Franzyshen,Edwin van Leeuwen,Germán Martín,Maximilian Schwarz,Doanh Doanh,Alteriom
 maintainer=Alteriom
 sentence=A painless way to setup a mesh with ESP8266 and ESP32 devices with Alteriom extensions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alteriom/painlessmesh",
-  "version": "1.7.7",
+  "version": "1.7.9",
   "description": "painlessMesh is a user-friendly library for creating mesh networks with ESP8266 and ESP32 devices. This Alteriom fork includes additional packages for sensor data (SensorPackage), device commands (CommandPackage), and status monitoring (StatusPackage). It handles routing and network management automatically, so you can focus on your application. The library uses JSON-based messaging and syncs time across all nodes, making it ideal for coordinated behaviour like synchronized light displays or sensor networks reporting to a central node.",
   "keywords": [
     "arduino",
@@ -39,7 +39,7 @@
     "url": "https://github.com/Alteriom/painlessMesh/issues"
   },
   "devDependencies": {
-    "@alteriom/mqtt-schema": "^0.7.2",
+    "@alteriom/mqtt-schema": "^0.7.3",
     "@eslint/js": "^9.0.0",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",

package/src/arduino/wifi.hpp

@@ -63,6 +63,7 @@ class Mesh : public painlessmesh::Mesh<Connection> {
     _meshSSID = ssid;
     _meshPassword = password;
     _meshChannel = channel;
+    Log(STARTUP, "init(): Mesh channel set to %d\n", _meshChannel);
     _meshHidden = hidden;
     _meshMaxConn = maxconn;
     _meshPort = port;
@@ -128,13 +129,21 @@ class Mesh : public painlessmesh::Mesh<Connection> {
    */
   void stationManual(TSTRING ssid, TSTRING password, uint16_t port = 0,
                      IPAddress remote_ip = IPAddress(0, 0, 0, 0)) {
+    using namespace logger;
     // Set station config
     stationScan.manualIP = remote_ip;
 
+    Log(STARTUP, "stationManual(): Connecting to %s\n", ssid.c_str());
+
     // Start scan
     stationScan.init(this, ssid, password, port, _meshChannel,
                      static_cast<bool>(_meshHidden));
     stationScan.manual = true;
+
+    // Directly initiate connection - ESP will auto-detect router's channel
+    WiFi.begin(ssid.c_str(), password.c_str());
+
+    Log(STARTUP, "stationManual(): Connection initiated\n");
   }
 
   void initStation() {

package/src/painlessMeshSTA.cpp

@@ -145,6 +145,11 @@ void ICACHE_FLASH_ATTR StationScan::requestIP(WiFi_AP_Record_t &ap) {
   using namespace painlessmesh::logger;
   Log(CONNECTION, "connectToAP(): Best AP is %u<---\n",
       painlessmesh::tcp::encodeNodeId(ap.bssid));
+  Log(CONNECTION, "requestIP(): Connecting to %s (channel: %d, BSSID: %02X:%02X:%02X:%02X:%02X:%02X)\n", 
+      ap.ssid.c_str(), 
+      mesh->_meshChannel,
+      ap.bssid[0], ap.bssid[1], ap.bssid[2], 
+      ap.bssid[3], ap.bssid[4], ap.bssid[5]);
   WiFi.begin(ap.ssid.c_str(), password.c_str(), mesh->_meshChannel, ap.bssid);
   return;
 }