thor/esphome-dev
1
0
Fork 0
mirror of https://github.com/Threnklyn/esphome-dev.git synced 2026-06-01 02:28:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add option to use MQTT abbreviations (#2641)

Browse Source
This commit is contained in:
Paul Monigatti
2021-10-31 15:34:08 +13:00
committed by GitHub
parent 7eee3cdc7f
commit 331a3ac387
14 changed files with 609 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/mqtt/mqtt_component.cpp
+21 -19
View File
@@ -7,6 +7,8 @@
#include "esphome/core/helpers.h"
#include "esphome/core/version.h"
#include "mqtt_const.h"
namespace esphome {
namespace mqtt {
@@ -69,49 +71,49 @@ bool MQTTComponent::send_discovery_() {
this->send_discovery(root, config);
// Fields from EntityBase
root["name"] = this->friendly_name();
root[MQTT_NAME] = this->friendly_name();
if (this->is_disabled_by_default())
root["enabled_by_default"] = false;
root[MQTT_ENABLED_BY_DEFAULT] = false;
if (!this->get_icon().empty())
root["icon"] = this->get_icon();
root[MQTT_ICON] = this->get_icon();
if (config.state_topic)
root["state_topic"] = this->get_state_topic_();
root[MQTT_STATE_TOPIC] = this->get_state_topic_();
if (config.command_topic)
root["command_topic"] = this->get_command_topic_();
root[MQTT_COMMAND_TOPIC] = this->get_command_topic_();
if (this->availability_ == nullptr) {
if (!global_mqtt_client->get_availability().topic.empty()) {
root["availability_topic"] = global_mqtt_client->get_availability().topic;
root[MQTT_AVAILABILITY_TOPIC] = global_mqtt_client->get_availability().topic;
if (global_mqtt_client->get_availability().payload_available != "online")
root["payload_available"] = global_mqtt_client->get_availability().payload_available;
root[MQTT_PAYLOAD_AVAILABLE] = global_mqtt_client->get_availability().payload_available;
if (global_mqtt_client->get_availability().payload_not_available != "offline")
root["payload_not_available"] = global_mqtt_client->get_availability().payload_not_available;
root[MQTT_PAYLOAD_NOT_AVAILABLE] = global_mqtt_client->get_availability().payload_not_available;
}
} else if (!this->availability_->topic.empty()) {
root["availability_topic"] = this->availability_->topic;
root[MQTT_AVAILABILITY_TOPIC] = this->availability_->topic;
if (this->availability_->payload_available != "online")
root["payload_available"] = this->availability_->payload_available;
root[MQTT_PAYLOAD_AVAILABLE] = this->availability_->payload_available;
if (this->availability_->payload_not_available != "offline")
root["payload_not_available"] = this->availability_->payload_not_available;
root[MQTT_PAYLOAD_NOT_AVAILABLE] = this->availability_->payload_not_available;
}
const std::string &node_name = App.get_name();
std::string unique_id = this->unique_id();
if (!unique_id.empty()) {
root["unique_id"] = unique_id;
root[MQTT_UNIQUE_ID] = unique_id;
} else {
// default to almost-unique ID. It's a hack but the only way to get that
// gorgeous device registry view.
root["unique_id"] = "ESP" + this->component_type() + this->get_default_object_id_();
root[MQTT_UNIQUE_ID] = "ESP" + this->component_type() + this->get_default_object_id_();
}
JsonObject &device_info = root.createNestedObject("device");
device_info["identifiers"] = get_mac_address();
device_info["name"] = node_name;
device_info["sw_version"] = "esphome v" ESPHOME_VERSION " " + App.get_compilation_time();
device_info["model"] = ESPHOME_BOARD;
device_info["manufacturer"] = "espressif";
JsonObject &device_info = root.createNestedObject(MQTT_DEVICE);
device_info[MQTT_DEVICE_IDENTIFIERS] = get_mac_address();
device_info[MQTT_DEVICE_NAME] = node_name;
device_info[MQTT_DEVICE_SW_VERSION] = "esphome v" ESPHOME_VERSION " " + App.get_compilation_time();
device_info[MQTT_DEVICE_MODEL] = ESPHOME_BOARD;
device_info[MQTT_DEVICE_MANUFACTURER] = "espressif";
},
0, discovery_info.retain);
}