Blocking mqtt option

sblantipodi · Jan 26, 2025 · 54839bd · 54839bd
1 parent 01f822e
commit 54839bd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/library.json b/library.json
@@ -6,7 +6,7 @@
         "type": "git",
         "url": "https://github.com/sblantipodi/arduino_bootstrapper.git"
     },
-    "version": "1.18.2",
+    "version": "1.18.3",
     "examples": "examples/*.cpp", 
     "exclude": "tests",
     "frameworks": "arduino",

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Bootstrapper
-version=1.18.2
+version=1.18.3
 author=Davide Perini <perini.davide@dpsoftware.org>
 maintainer=Davide Perini <perini.davide@dpsoftware.org>
 sentence=A client library for MQTT messaging.

diff --git a/src/Helpers.cpp b/src/Helpers.cpp
@@ -50,8 +50,10 @@ String mqttpass = "XXX";
 String mqttWillTopic = "0";
 String mqttWillPayload = "0";
 int mqttWillQOS = 1;
-bool mqttWillRetain = 0;
-bool mqttCleanSession = 1;
+bool mqttWillRetain = false;
+bool mqttCleanSession = true;
+bool blockingMqtt = true;
+bool mqttConnected = false;
 String additionalParam = "XXX";
 bool ethConnected = false;
 

diff --git a/src/Helpers.h b/src/Helpers.h
@@ -53,6 +53,8 @@ extern String mqttWillPayload;
 extern int mqttWillQOS;
 extern bool mqttWillRetain;
 extern bool mqttCleanSession;
+extern bool mqttConnected;
+extern bool blockingMqtt;
 extern String additionalParam;
 extern bool ethConnected;
 

diff --git a/src/QueueManager.cpp b/src/QueueManager.cpp
@@ -113,13 +113,19 @@ void QueueManager::mqttReconnect(void (*manageDisconnections)(), void (*manageQu
       // Wait 500 millis before retrying
       delay(DELAY_500);
     }
+    if (!blockingMqtt) {
+      break;
+    }
   }
 }
 
 void QueueManager::queueLoop(void (*manageDisconnections)(), void (*manageQueueSubscription)(),
                              void (*manageHardwareButton)()) {
   if (!mqttClient.connected()) {
+    mqttConnected = false;
     mqttReconnect(manageDisconnections, manageQueueSubscription, manageHardwareButton);
+  } else {
+    mqttConnected = true;
   }
   mqttClient.loop();
 }