andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-26 16:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

changes to HA

Browse Source
This commit is contained in:
proddy
2025-12-18 21:40:08 +01:00
parent 39d18b78a1
commit 99afeb221a
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/mqtt.cpp
View File

@@ -1448,27 +1448,31 @@ void Mqtt::add_ha_dev_section(JsonObject doc, const char * name, const char * mo
return; return;
} }
// create dev section JsonObject dev_json = doc["dev"].to<JsonObject>(); // create dev section
JsonObject dev_json = doc["dev"].to<JsonObject>();
// add ids and name - capitalize first letter of the name // add ids - capitalize first letter of the name if there is one
JsonArray ids = dev_json["ids"].to<JsonArray>(); // ids, it is an array with a single element JsonArray ids = dev_json["ids"].to<JsonArray>(); // ids, it is an array with a single element
if (name != nullptr) { if (name != nullptr) {
// for ids, replace all spaces with - // for ids, replace all spaces with - and add to the basename
std::string lower_name_str(name); std::string lower_name_str(name);
std::replace(lower_name_str.begin(), lower_name_str.end(), ' ', '-'); std::replace(lower_name_str.begin(), lower_name_str.end(), ' ', '-');
ids.add(Mqtt::basename() + "-" + Helpers::toLower(lower_name_str)); ids.add(Mqtt::basename() + "-" + Helpers::toLower(lower_name_str));
auto cap_name = strdup(name);
Helpers::CharToUpperUTF8(cap_name); // capitalize first letter
dev_json["name"] = Mqtt::basename() + " " + cap_name;
free(cap_name);
} else { } else {
ids.add(Mqtt::basename()); // no name, assign it to the main EMS-ESP device in HA ids.add(Mqtt::basename()); // no name, assign it to the main EMS-ESP device in HA
} }
// create the model, manufacturer and version // create the name, model, manufacturer and version
if (create_model) { if (create_model) {
if (name != nullptr) {
auto cap_name = strdup(name);
Helpers::CharToUpperUTF8(cap_name); // capitalize first letter
dev_json["name"] = Mqtt::basename() + " " + cap_name;
free(cap_name);
} else {
dev_json["name"] = Mqtt::basename();
}
// add mf, mdl, sw and via_device
dev_json["mf"] = brand != nullptr ? brand : "EMS-ESP"; dev_json["mf"] = brand != nullptr ? brand : "EMS-ESP";
if (model != nullptr) { if (model != nullptr) {
dev_json["mdl"] = model; dev_json["mdl"] = model;