Skip to content

Commit 112a28a

Browse files
authored
Fixes MQTT_GW: Dynamic subscribe topic declaration (#1388)
1 parent 869d6d2 commit 112a28a

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

core/MyGatewayTransportMQTTClient.cpp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,10 @@ bool reconnectMQTT(void)
152152
// Send presentation of locally attached sensors (and node if applicable)
153153
presentNode();
154154
// Once connected, publish subscribe
155-
if (__builtin_constant_p(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX)) {
156-
// to save some memory
157-
_MQTT_client.subscribe(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX "/+/+/+/+/+");
158-
} else {
159-
char inTopic[strlen(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX) + strlen("/+/+/+/+/+")];
160-
(void)strncpy(inTopic, MY_MQTT_SUBSCRIBE_TOPIC_PREFIX, strlen(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX) + 1);
161-
(void)strcat(inTopic, "/+/+/+/+/+");
162-
_MQTT_client.subscribe(inTopic);
163-
}
155+
char inTopic[strlen(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX) + strlen("/+/+/+/+/+")];
156+
(void)strncpy(inTopic, MY_MQTT_SUBSCRIBE_TOPIC_PREFIX, strlen(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX) + 1);
157+
(void)strcat(inTopic, "/+/+/+/+/+");
158+
_MQTT_client.subscribe(inTopic);
164159

165160
return true;
166161
}

0 commit comments

Comments
 (0)