MQTT Resubscribe on reconnect

zipou · Dec 3, 2018 · 2d4fdc4 · 2d4fdc4
1 parent d7ae122
commit 2d4fdc4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/lib/MqttLib/src/MqttLib.cpp b/lib/MqttLib/src/MqttLib.cpp
@@ -7,15 +7,20 @@ MQTTClient _client;
 
 MqttLibCallback MqttLib::_callback;
 MqttLibErrorCallback MqttLib::_errorCallback;
+MqttLibConnectCallback MqttLib::_connectCallback;
 
 char* _username;
 char* _password;
 char* _clientId;
+char* _topicList;
 
 void MqttLib::setErrorCallback(MqttLibErrorCallback callback) {
  MqttLib::_errorCallback = callback;
 }
 
+void MqttLib::setConnectCallback(MqttLibConnectCallback callback) {
+ MqttLib::_connectCallback = callback;
+}
 
 void MqttLib::setCallback(MqttLibCallback callback) {
  MqttLib::_callback = callback;
@@ -85,6 +90,8 @@ void MqttLib::publish(const char* topic, const char* message) {
  _client.publish(topic, message);
 }
 
+
+
 bool MqttLib::connect() {
  int i = 0;
  Serial.print("Trying to connect to MQTT");
@@ -101,6 +108,9 @@ bool MqttLib::connect() {
  ++i;
  }
  Serial.println("MQTT connected");
+ if (MqttLib::_connectCallback != NULL) {
+ (*MqttLib::_connectCallback)();
+ }
  return true;
 }
 

diff --git a/lib/MqttLib/src/MqttLib.h b/lib/MqttLib/src/MqttLib.h
@@ -3,6 +3,7 @@
 
 typedef void (*MqttLibCallback)(const char* topic, const char* payload);
 typedef void (*MqttLibErrorCallback)();
+typedef void (*MqttLibConnectCallback)();
 
 class MqttLib {
 
@@ -16,8 +17,10 @@ class MqttLib {
  void static acknowledge(String payload);
  void subscribe(const char* topic);
  void setCallback(MqttLibCallback _callback);
+ void setConnectCallback(MqttLibConnectCallback _connectCallback);
  void setErrorCallback(MqttLibErrorCallback _errorCallback);
  static MqttLibCallback _callback;
  static MqttLibErrorCallback _errorCallback;
+ static MqttLibConnectCallback _connectCallback;
  protected:
 };
diff --git a/src/EspGw.cpp b/src/EspGw.cpp
@@ -83,6 +83,11 @@ void mqttErrorCallback() {
  restartEsp();
 }
 
+void mqttConnectCallback() {
+ mqttlib.subscribe(MQTT_TOPIC_IN);
+ mqttlib.subscribe(MQTT_TOPIC_IN_RAW);
+}
+
 void mqttCallback(const char* topic, const char* message) {
  if (strcmp(topic, MQTT_TOPIC_IN) == 0) {
  StaticJsonBuffer<200> jsonBuffer;
@@ -137,10 +142,11 @@ void setup() {
  Serial.println("ClientId");
  Serial.println(clientId);
  mqttlib.setErrorCallback(mqttErrorCallback);
+ mqttlib.setConnectCallback(mqttConnectCallback);
  mqttlib.init(MQTT_HOST, MQTT_PORT, MQTT_USERNAME, MQTT_PASSWORD, clientId);
  mqttlib.setCallback(mqttCb);
- mqttlib.subscribe(MQTT_TOPIC_IN);
- mqttlib.subscribe(MQTT_TOPIC_IN_RAW);
+ // mqttlib.subscribe(MQTT_TOPIC_IN);
+ // mqttlib.subscribe(MQTT_TOPIC_IN_RAW);
 
  rf.init(RF_TRANSMITTER_PIN, RF_RECEIVER_PIN);
  RFLibCallback afunc = &rfCallback;