thor/esphome-dev
1
0
Fork 0
mirror of https://github.com/Threnklyn/esphome-dev.git synced 2026-05-25 15:18:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(MQTT): Add QoS option for each MQTT component (#6279)

Browse Source
This commit is contained in:
Rodrigo Martín
2024-03-11 01:12:52 +01:00
committed by GitHub
parent c899a33d1a
commit 6a8a2aaefb
6 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/mqtt/mqtt_component.cpp
+8 -4
View File
@@ -14,6 +14,8 @@ namespace mqtt {
static const char *const TAG = "mqtt.component";
void MQTTComponent::set_qos(uint8_t qos) { this->qos_ = qos; }
void MQTTComponent::set_retain(bool retain) { this->retain_ = retain; }
std::string MQTTComponent::get_discovery_topic_(const MQTTDiscoveryInfo &discovery_info) const {
@@ -47,13 +49,13 @@ std::string MQTTComponent::get_command_topic_() const {
bool MQTTComponent::publish(const std::string &topic, const std::string &payload) {
if (topic.empty())
return false;
return global_mqtt_client->publish(topic, payload, 0, this->retain_);
return global_mqtt_client->publish(topic, payload, this->qos_, this->retain_);
}
bool MQTTComponent::publish_json(const std::string &topic, const json::json_build_t &f) {
if (topic.empty())
return false;
return global_mqtt_client->publish_json(topic, f, 0, this->retain_);
return global_mqtt_client->publish_json(topic, f, this->qos_, this->retain_);
}
bool MQTTComponent::send_discovery_() {
@@ -61,7 +63,7 @@ bool MQTTComponent::send_discovery_() {
if (discovery_info.clean) {
ESP_LOGV(TAG, "'%s': Cleaning discovery...", this->friendly_name().c_str());
return global_mqtt_client->publish(this->get_discovery_topic_(discovery_info), "", 0, 0, true);
return global_mqtt_client->publish(this->get_discovery_topic_(discovery_info), "", 0, this->qos_, true);
}
ESP_LOGV(TAG, "'%s': Sending discovery...", this->friendly_name().c_str());
@@ -155,9 +157,11 @@ bool MQTTComponent::send_discovery_() {
device_info[MQTT_DEVICE_MANUFACTURER] = "espressif";
device_info[MQTT_DEVICE_SUGGESTED_AREA] = node_area;
},
0, discovery_info.retain);
this->qos_, discovery_info.retain);
}
uint8_t MQTTComponent::get_qos() const { return this->qos_; }
bool MQTTComponent::get_retain() const { return this->retain_; }
bool MQTTComponent::is_discovery_enabled() const {