Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-09-18 02:41:54 +02:00
Code Issues Projects Releases Wiki Activity

fix to PR # 3887 MQTT connection not using discovery: false (#5275)

Browse Source
This commit is contained in:
luka6000 2023-09-01 03:20:21 +02:00 committed by Jesse Hills
parent 2cabe59c22
commit c146712b16
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
esphome/components/mqtt/mqtt_client.cpp
View File

@ -66,6 +66,7 @@ void MQTTClientComponent::setup() {
} }
#endif #endif
if (this->is_discovery_enabled()) {
this->subscribe( this->subscribe(
"esphome/discover", [this](const std::string &topic, const std::string &payload) { this->send_device_info_(); }, "esphome/discover", [this](const std::string &topic, const std::string &payload) { this->send_device_info_(); },
2); 2);
@ -74,17 +75,19 @@ void MQTTClientComponent::setup() {
topic.append(App.get_name()); topic.append(App.get_name());
this->subscribe( this->subscribe(
topic, [this](const std::string &topic, const std::string &payload) { this->send_device_info_(); }, 2); topic, [this](const std::string &topic, const std::string &payload) { this->send_device_info_(); }, 2);
}
this->last_connected_ = millis(); this->last_connected_ = millis();
this->start_dnslookup_(); this->start_dnslookup_();
} }
void MQTTClientComponent::send_device_info_() { void MQTTClientComponent::send_device_info_() {
if (!this->is_connected()) { if (!this->is_connected() or !this->is_discovery_enabled()) {
return; return;
} }
std::string topic = "esphome/discover/"; std::string topic = "esphome/discover/";
topic.append(App.get_name()); topic.append(App.get_name());
this->publish_json( this->publish_json(
topic, topic,
[](JsonObject root) { [](JsonObject root) {