Merge branch '0_15' into end_oappend_v2

This commit is contained in:
Blaz Kristan
2024-09-24 21:43:47 +02:00
49 changed files with 338 additions and 394 deletions

View File

@@ -45,7 +45,7 @@ static void onMqttConnect(bool sessionPresent)
mqtt->subscribe(subuf, 0);
}
usermods.onMqttConnect(sessionPresent);
UsermodManager::onMqttConnect(sessionPresent);
DEBUG_PRINTLN(F("MQTT ready"));
publishMqtt();
@@ -89,7 +89,7 @@ static void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProp
topic += topicPrefixLen;
} else {
// Non-Wled Topic used here. Probably a usermod subscribed to this topic.
usermods.onMqttMessage(topic, payloadStr);
UsermodManager::onMqttMessage(topic, payloadStr);
delete[] payloadStr;
payloadStr = nullptr;
return;
@@ -115,7 +115,7 @@ static void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProp
}
} else if (strlen(topic) != 0) {
// non standard topic, check with usermods
usermods.onMqttMessage(topic, payloadStr);
UsermodManager::onMqttMessage(topic, payloadStr);
} else {
// topmost topic (just wled/MAC)
parseMQTTBriPayload(payloadStr);